diff --git a/products/secretmanager/api.yaml b/products/secretmanager/api.yaml index ca3699c624c9..8a278414d5df 100644 --- a/products/secretmanager/api.yaml +++ b/products/secretmanager/api.yaml @@ -15,6 +15,9 @@ name: SecretManager display_name: Secret Manager versions: + - !ruby/object:Api::Product::Version + name: ga + base_url: https://secretmanager.googleapis.com/v1/ - !ruby/object:Api::Product::Version name: beta base_url: https://secretmanager.googleapis.com/v1beta1/ @@ -27,7 +30,6 @@ apis_required: objects: - !ruby/object:Api::Resource name: Secret - min_version: beta self_link: projects/{{project}}/secrets/{{secret_id}} base_url: projects/{{project}}/secrets create_url: projects/{{project}}/secrets?secretId={{secret_id}} @@ -38,7 +40,7 @@ objects: method_name_separator: ':' exclude: false references: !ruby/object:Api::Resource::ReferenceLinks - api: 'https://cloud.google.com/secret-manager/docs/reference/rest/v1beta1/projects.secrets' + api: 'https://cloud.google.com/secret-manager/docs/reference/rest/v1/projects.secrets' description: | A Secret is a logical secret whose value and versions can be accessed. parameters: @@ -114,7 +116,6 @@ objects: The canonical IDs of the location to replicate data. For example: "us-east1". - !ruby/object:Api::Resource name: SecretVersion - min_version: beta base_url: '{{name}}' self_link: '{{name}}' create_url: '{{secret}}:addVersion' diff --git a/products/secretmanager/terraform.yaml b/products/secretmanager/terraform.yaml index f78868c92a20..4afdb8ff2404 100644 --- a/products/secretmanager/terraform.yaml +++ b/products/secretmanager/terraform.yaml @@ -17,8 +17,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides - !ruby/object:Provider::Terraform::Examples name: "secret_config_basic" primary_resource_id: "secret-basic" - primary_resource_name: "fmt.Sprintf(\"tf-test-test-secret-basic%s\", context[\"random_suffix\"])" - min_version: beta + primary_resource_name: "fmt.Sprintf(\"secret%s\", context[\"random_suffix\"])" vars: secret_id: "secret" import_format: ["projects/{{project}}/secrets/{{secret_id}}"] @@ -34,7 +33,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides - !ruby/object:Provider::Terraform::Examples name: "secret_version_basic" primary_resource_id: "secret-version-basic" - min_version: beta vars: secret_id: "secret-version" data: "secret-data" diff --git a/templates/terraform/examples/secret_config_basic.tf.erb b/templates/terraform/examples/secret_config_basic.tf.erb index 1fcb383d7dea..9e4daaa00033 100644 --- a/templates/terraform/examples/secret_config_basic.tf.erb +++ b/templates/terraform/examples/secret_config_basic.tf.erb @@ -1,6 +1,4 @@ resource "google_secret_manager_secret" "<%= ctx[:primary_resource_id] %>" { - provider = google-beta - secret_id = "<%= ctx[:vars]['secret_id'] %>" labels = { diff --git a/templates/terraform/examples/secret_version_basic.tf.erb b/templates/terraform/examples/secret_version_basic.tf.erb index 13a1a74c42dc..3df2522be8f0 100644 --- a/templates/terraform/examples/secret_version_basic.tf.erb +++ b/templates/terraform/examples/secret_version_basic.tf.erb @@ -1,6 +1,4 @@ resource "google_secret_manager_secret" "secret-basic" { - provider = google-beta - secret_id = "<%= ctx[:vars]['secret_id'] %>" labels = { @@ -14,8 +12,6 @@ resource "google_secret_manager_secret" "secret-basic" { resource "google_secret_manager_secret_version" "<%= ctx[:primary_resource_id] %>" { - provider = google-beta - secret = google_secret_manager_secret.secret-basic.id secret_data = "<%= ctx[:vars]['data'] %>" diff --git a/third_party/terraform/data_sources/data_source_secret_manager_secret_version.go.erb b/third_party/terraform/data_sources/data_source_secret_manager_secret_version.go.erb index 137f0c2cdad1..714b5ab07d78 100644 --- a/third_party/terraform/data_sources/data_source_secret_manager_secret_version.go.erb +++ b/third_party/terraform/data_sources/data_source_secret_manager_secret_version.go.erb @@ -1,6 +1,5 @@ <% autogen_exception -%> package google -<% unless version == "ga" -%> import ( "fmt" @@ -125,5 +124,3 @@ func dataSourceSecretManagerSecretVersionRead(d *schema.ResourceData, meta inter d.SetId(time.Now().UTC().String()) return nil } - -<% end -%> diff --git a/third_party/terraform/tests/data_source_secret_manager_secret_version_test.go.erb b/third_party/terraform/tests/data_source_secret_manager_secret_version_test.go.erb index 9961a95fc7d1..c8699fd19456 100644 --- a/third_party/terraform/tests/data_source_secret_manager_secret_version_test.go.erb +++ b/third_party/terraform/tests/data_source_secret_manager_secret_version_test.go.erb @@ -1,6 +1,5 @@ <% autogen_exception -%> package google -<% unless version == "ga" -%> import ( "errors" @@ -19,7 +18,7 @@ func TestAccDatasourceSecretManagerSecretVersion_basic(t *testing.T) { vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, CheckDestroy: testAccCheckSecretManagerSecretVersionDestroyProducer(t), Steps: []resource.TestStep{ { @@ -39,7 +38,7 @@ func TestAccDatasourceSecretManagerSecretVersion_latest(t *testing.T) { vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, CheckDestroy: testAccCheckSecretManagerSecretVersionDestroyProducer(t), Steps: []resource.TestStep{ { @@ -78,7 +77,6 @@ func testAccCheckDatasourceSecretManagerSecretVersion(n, expected string) resour func testAccDatasourceSecretManagerSecretVersion_latest(randomString string) string { return fmt.Sprintf(` resource "google_secret_manager_secret" "secret-basic" { - provider = google-beta secret_id = "tf-test-secret-version-%s" labels = { label = "my-label" @@ -89,13 +87,11 @@ resource "google_secret_manager_secret" "secret-basic" { } resource "google_secret_manager_secret_version" "secret-version-basic-1" { - provider = google-beta secret = google_secret_manager_secret.secret-basic.name secret_data = "my-tf-test-secret-first" } resource "google_secret_manager_secret_version" "secret-version-basic-2" { - provider = google-beta secret = google_secret_manager_secret.secret-basic.name secret_data = "my-tf-test-secret-second" @@ -103,7 +99,6 @@ resource "google_secret_manager_secret_version" "secret-version-basic-2" { } data "google_secret_manager_secret_version" "latest" { - provider = google-beta secret = google_secret_manager_secret_version.secret-version-basic-2.secret } `, randomString) @@ -112,7 +107,6 @@ data "google_secret_manager_secret_version" "latest" { func testAccDatasourceSecretManagerSecretVersion_basic(randomString string) string { return fmt.Sprintf(` resource "google_secret_manager_secret" "secret-basic" { - provider = google-beta secret_id = "tf-test-secret-version-%s" labels = { label = "my-label" @@ -123,16 +117,13 @@ resource "google_secret_manager_secret" "secret-basic" { } resource "google_secret_manager_secret_version" "secret-version-basic" { - provider = google-beta secret = google_secret_manager_secret.secret-basic.name secret_data = "my-tf-test-secret-%s" } data "google_secret_manager_secret_version" "basic" { - provider = google-beta secret = google_secret_manager_secret_version.secret-version-basic.secret version = 1 } `, randomString, randomString) } -<% end -%> diff --git a/third_party/terraform/tests/resource_secret_manager_secret_test.go.erb b/third_party/terraform/tests/resource_secret_manager_secret_test.go.erb index 0671530d63cb..198a98dcc5fc 100644 --- a/third_party/terraform/tests/resource_secret_manager_secret_test.go.erb +++ b/third_party/terraform/tests/resource_secret_manager_secret_test.go.erb @@ -1,6 +1,5 @@ <% autogen_exception -%> package google -<% unless version == 'ga' -%> import ( "fmt" @@ -57,4 +56,3 @@ resource "google_secret_manager_secret" "secret-basic" { } `, context) } -<% end -%> diff --git a/third_party/terraform/tests/resource_secret_manager_secret_version_test.go.erb b/third_party/terraform/tests/resource_secret_manager_secret_version_test.go.erb index 8dff0ea5b2a6..6ab65a039c70 100644 --- a/third_party/terraform/tests/resource_secret_manager_secret_version_test.go.erb +++ b/third_party/terraform/tests/resource_secret_manager_secret_version_test.go.erb @@ -1,6 +1,5 @@ <% autogen_exception -%> package google -<% unless version == 'ga' -%> import ( "fmt" @@ -99,5 +98,3 @@ resource "google_secret_manager_secret_version" "secret-version-basic" { } `, context) } - -<% end -%> diff --git a/third_party/terraform/utils/provider.go.erb b/third_party/terraform/utils/provider.go.erb index e2c41ceaae3a..36884dfd20a8 100644 --- a/third_party/terraform/utils/provider.go.erb +++ b/third_party/terraform/utils/provider.go.erb @@ -201,9 +201,7 @@ func Provider() terraform.ResourceProvider { "google_project": dataSourceGoogleProject(), "google_projects": dataSourceGoogleProjects(), "google_project_organization_policy": dataSourceGoogleProjectOrganizationPolicy(), - <% unless version == 'ga' -%> "google_secret_manager_secret_version": dataSourceSecretManagerSecretVersion(), - <% end -%> "google_service_account": dataSourceGoogleServiceAccount(), "google_service_account_access_token": dataSourceGoogleServiceAccountAccessToken(), "google_service_account_key": dataSourceGoogleServiceAccountKey(), diff --git a/third_party/terraform/website/docs/d/datasource_google_secret_manager_secret_version.html.markdown b/third_party/terraform/website/docs/d/datasource_google_secret_manager_secret_version.html.markdown index 5278c7515361..a316e77739f4 100644 --- a/third_party/terraform/website/docs/d/datasource_google_secret_manager_secret_version.html.markdown +++ b/third_party/terraform/website/docs/d/datasource_google_secret_manager_secret_version.html.markdown @@ -9,13 +9,12 @@ description: |- # google\_secret\_manager\_secret\_version -Get a Secret Manager secret's version. For more information see the [official documentation](https://cloud.google.com/secret-manager/docs/) and [API](https://cloud.google.com/secret-manager/docs/reference/rest/v1beta1/projects.secrets.versions). +Get a Secret Manager secret's version. For more information see the [official documentation](https://cloud.google.com/secret-manager/docs/) and [API](https://cloud.google.com/secret-manager/docs/reference/rest/v1/projects.secrets.versions). ## Example Usage ```hcl data "google_secret_manager_secret_version" "basic" { - provider = google-beta secret = "my-secret" } ```