Skip to content

Commit 2869e70

Browse files
modular-magicianmodular-magician
authored
Promote Global & Regional Parameter Manager Resources & Datasources to GA (#13473) (#9671)
[upstream:0ae61ce7a16c0c85a5399abab47c495e75f42e66] Signed-off-by: Modular Magician <[email protected]>
1 parent 73b253a commit 2869e70

File tree

29 files changed

+90
-257
lines changed

29 files changed

+90
-257
lines changed

‎.changelog/13473.txt

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
```release-note:new-datasource
2+
`google_parameter_manager_parameter` (ga)
3+
```
4+
```release-note:new-datasource
5+
`google_parameter_manager_parameters` (ga)
6+
```
7+
```release-note:new-datasource
8+
`google_parameter_manager_parameter_version` (ga)
9+
```
10+
```release-note:new-datasource
11+
`google_parameter_manager_parameter_version_render` (ga)
12+
```
13+
```release-note:new-datasource
14+
`google_parameter_manager_regional_parameter` (ga)
15+
```
16+
```release-note:new-datasource
17+
`google_parameter_manager_regional_parameters` (ga)
18+
```
19+
```release-note:new-datasource
20+
`google_parameter_manager_regional_parameter_version` (ga)
21+
```
22+
```release-note:new-datasource
23+
`google_parameter_manager_regional_parameter_version_render` (ga)
24+
```
25+
```release-note:new-resource
26+
`google_parameter_manager_parameter` (ga)
27+
```
28+
```release-note:new-resource
29+
`google_parameter_manager_parameter_version` (ga)
30+
```
31+
```release-note:new-resource
32+
`google_parameter_manager_regional_parameter` (ga)
33+
```
34+
```release-note:new-resource
35+
`google_parameter_manager_regional_parameter_version` (ga)
36+
```

‎google-beta/services/parametermanager/data_source_parameter_manager_parameter_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccDataSourceParameterManagerParameter_basic(t *testing.T) {
1818

1919
acctest.VcrTest(t, resource.TestCase{
2020
PreCheck: func() { acctest.AccTestPreCheck(t) },
21-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
21+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2222
CheckDestroy: testAccCheckParameterManagerParameterDestroyProducer(t),
2323
Steps: []resource.TestStep{
2424
{
@@ -37,7 +37,6 @@ func TestAccDataSourceParameterManagerParameter_basic(t *testing.T) {
3737
func testAccDataSourceParameterManagerParameter_basic(context map[string]interface{}) string {
3838
return acctest.Nprintf(`
3939
resource "google_parameter_manager_parameter" "parameter" {
40-
provider = google-beta
4140
parameter_id = "tf_test_parameter%{random_suffix}"
4241
format = "YAML"
4342
@@ -51,7 +50,6 @@ resource "google_parameter_manager_parameter" "parameter" {
5150
}
5251
5352
data "google_parameter_manager_parameter" "parameter-datasource" {
54-
provider = google-beta
5553
parameter_id = google_parameter_manager_parameter.parameter.parameter_id
5654
}
5755
`, context)

‎google-beta/services/parametermanager/data_source_parameter_manager_parameter_version_render_test.go

+3-21
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccDataSourceParameterManagerParameterVersionRender_basicWithResourceRe
2222

2323
acctest.VcrTest(t, resource.TestCase{
2424
PreCheck: func() { acctest.AccTestPreCheck(t) },
25-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
25+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2626
CheckDestroy: testAccCheckParameterManagerParameterVersionDestroyProducer(t),
2727
Steps: []resource.TestStep{
2828
{
@@ -39,34 +39,29 @@ func TestAccDataSourceParameterManagerParameterVersionRender_basicWithResourceRe
3939
func testAccParameterManagerParameterVersionRender_basicWithResourceReference(context map[string]interface{}) string {
4040
return acctest.Nprintf(`
4141
resource "google_parameter_manager_parameter" "parameter-basic" {
42-
provider = google-beta
4342
parameter_id = "tf_test_parameter%{random_suffix}"
4443
format = "YAML"
4544
}
4645
4746
resource "google_secret_manager_secret" "secret-basic" {
48-
provider = google-beta
4947
secret_id = "tf-temp-secret-basic%{random_suffix}"
5048
replication {
5149
auto {}
5250
}
5351
}
5452
5553
resource "google_secret_manager_secret_version" "secret-version-basic" {
56-
provider = google-beta
5754
secret = google_secret_manager_secret.secret-basic.id
5855
secret_data = "parameter-version-data"
5956
}
6057
6158
resource "google_secret_manager_secret_iam_member" "member" {
62-
provider = google-beta
6359
secret_id = google_secret_manager_secret.secret-basic.secret_id
6460
role = "roles/secretmanager.secretAccessor"
6561
member = "${google_parameter_manager_parameter.parameter-basic.policy_member[0].iam_policy_uid_principal}"
6662
}
6763
6864
resource "google_parameter_manager_parameter_version" "parameter-version-basic" {
69-
provider = google-beta
7065
parameter = google_parameter_manager_parameter.parameter-basic.id
7166
parameter_version_id = "tf_test_parameter_version%{random_suffix}"
7267
parameter_data = yamlencode({
@@ -75,7 +70,6 @@ resource "google_parameter_manager_parameter_version" "parameter-version-basic"
7570
}
7671
7772
data "google_parameter_manager_parameter_version_render" "parameter-version-basic" {
78-
provider = google-beta
7973
parameter = google_parameter_manager_parameter_version.parameter-version-basic.parameter
8074
parameter_version_id = google_parameter_manager_parameter_version.parameter-version-basic.parameter_version_id
8175
}
@@ -91,7 +85,7 @@ func TestAccDataSourceParameterManagerParameterVersionRender_withJsonData(t *tes
9185

9286
acctest.VcrTest(t, resource.TestCase{
9387
PreCheck: func() { acctest.AccTestPreCheck(t) },
94-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
88+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
9589
CheckDestroy: testAccCheckParameterManagerParameterVersionDestroyProducer(t),
9690
Steps: []resource.TestStep{
9791
{
@@ -108,34 +102,29 @@ func TestAccDataSourceParameterManagerParameterVersionRender_withJsonData(t *tes
108102
func testAccParameterManagerParameterVersionRender_withJsonData(context map[string]interface{}) string {
109103
return acctest.Nprintf(`
110104
resource "google_parameter_manager_parameter" "parameter-basic" {
111-
provider = google-beta
112105
parameter_id = "tf_test_parameter%{random_suffix}"
113106
format = "JSON"
114107
}
115108
116109
resource "google_secret_manager_secret" "secret-basic" {
117-
provider = google-beta
118110
secret_id = "tf-temp-secret-json-data%{random_suffix}"
119111
replication {
120112
auto {}
121113
}
122114
}
123115
124116
resource "google_secret_manager_secret_version" "secret-version-basic" {
125-
provider = google-beta
126117
secret = google_secret_manager_secret.secret-basic.id
127118
secret_data = "parameter-version-data"
128119
}
129120
130121
resource "google_secret_manager_secret_iam_member" "member" {
131-
provider = google-beta
132122
secret_id = google_secret_manager_secret.secret-basic.secret_id
133123
role = "roles/secretmanager.secretAccessor"
134124
member = "${google_parameter_manager_parameter.parameter-basic.policy_member[0].iam_policy_uid_principal}"
135125
}
136126
137127
resource "google_parameter_manager_parameter_version" "parameter-version-with-json-data" {
138-
provider = google-beta
139128
parameter = google_parameter_manager_parameter.parameter-basic.id
140129
parameter_version_id = "tf_test_parameter_version%{random_suffix}"
141130
parameter_data = jsonencode({
@@ -144,7 +133,6 @@ resource "google_parameter_manager_parameter_version" "parameter-version-with-js
144133
}
145134
146135
data "google_parameter_manager_parameter_version_render" "parameter-version-with-json-data" {
147-
provider = google-beta
148136
parameter = google_parameter_manager_parameter.parameter-basic.parameter_id
149137
parameter_version_id = google_parameter_manager_parameter_version.parameter-version-with-json-data.parameter_version_id
150138
}
@@ -160,7 +148,7 @@ func TestAccDataSourceParameterManagerParameterVersionRender_withYamlData(t *tes
160148

161149
acctest.VcrTest(t, resource.TestCase{
162150
PreCheck: func() { acctest.AccTestPreCheck(t) },
163-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
151+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
164152
CheckDestroy: testAccCheckParameterManagerParameterVersionDestroyProducer(t),
165153
Steps: []resource.TestStep{
166154
{
@@ -177,34 +165,29 @@ func TestAccDataSourceParameterManagerParameterVersionRender_withYamlData(t *tes
177165
func testAccParameterManagerParameterVersionRender_withYamlData(context map[string]interface{}) string {
178166
return acctest.Nprintf(`
179167
resource "google_parameter_manager_parameter" "parameter-basic" {
180-
provider = google-beta
181168
parameter_id = "tf_test_parameter%{random_suffix}"
182169
format = "YAML"
183170
}
184171
185172
resource "google_secret_manager_secret" "secret-basic" {
186-
provider = google-beta
187173
secret_id = "tf-temp-secret-yaml-data%{random_suffix}"
188174
replication {
189175
auto {}
190176
}
191177
}
192178
193179
resource "google_secret_manager_secret_version" "secret-version-basic" {
194-
provider = google-beta
195180
secret = google_secret_manager_secret.secret-basic.id
196181
secret_data = "parameter-version-data"
197182
}
198183
199184
resource "google_secret_manager_secret_iam_member" "member" {
200-
provider = google-beta
201185
secret_id = google_secret_manager_secret.secret-basic.secret_id
202186
role = "roles/secretmanager.secretAccessor"
203187
member = "${google_parameter_manager_parameter.parameter-basic.policy_member[0].iam_policy_uid_principal}"
204188
}
205189
206190
resource "google_parameter_manager_parameter_version" "parameter-version-with-yaml-data" {
207-
provider = google-beta
208191
parameter = google_parameter_manager_parameter.parameter-basic.id
209192
parameter_version_id = "tf_test_parameter_version%{random_suffix}"
210193
parameter_data = yamlencode({
@@ -213,7 +196,6 @@ resource "google_parameter_manager_parameter_version" "parameter-version-with-ya
213196
}
214197
215198
data "google_parameter_manager_parameter_version_render" "parameter-version-with-yaml-data" {
216-
provider = google-beta
217199
parameter = google_parameter_manager_parameter.parameter-basic.parameter_id
218200
parameter_version_id = google_parameter_manager_parameter_version.parameter-version-with-yaml-data.parameter_version_id
219201
}

‎google-beta/services/parametermanager/data_source_parameter_manager_parameter_version_test.go

+6-23
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccDataSourceParameterManagerParameterVersion_basicWithResourceReferenc
2222

2323
acctest.VcrTest(t, resource.TestCase{
2424
PreCheck: func() { acctest.AccTestPreCheck(t) },
25-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
25+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2626
CheckDestroy: testAccCheckParameterManagerParameterVersionDestroyProducer(t),
2727
Steps: []resource.TestStep{
2828
{
@@ -39,19 +39,16 @@ func TestAccDataSourceParameterManagerParameterVersion_basicWithResourceReferenc
3939
func testAccParameterManagerParameterVersion_basicWithResourceReference(context map[string]interface{}) string {
4040
return acctest.Nprintf(`
4141
resource "google_parameter_manager_parameter" "parameter-basic" {
42-
provider = google-beta
4342
parameter_id = "tf_test_parameter%{random_suffix}"
4443
}
4544
4645
resource "google_parameter_manager_parameter_version" "parameter-version-basic" {
47-
provider = google-beta
4846
parameter = google_parameter_manager_parameter.parameter-basic.id
4947
parameter_version_id = "tf_test_parameter_version%{random_suffix}"
5048
parameter_data = "test-parameter-data-with-resource-reference"
5149
}
5250
5351
data "google_parameter_manager_parameter_version" "parameter-version-basic" {
54-
provider = google-beta
5552
parameter = google_parameter_manager_parameter_version.parameter-version-basic.parameter
5653
parameter_version_id = google_parameter_manager_parameter_version.parameter-version-basic.parameter_version_id
5754
}
@@ -67,7 +64,7 @@ func TestAccDataSourceParameterManagerParameterVersion_basicWithParameterName(t
6764

6865
acctest.VcrTest(t, resource.TestCase{
6966
PreCheck: func() { acctest.AccTestPreCheck(t) },
70-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
67+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
7168
CheckDestroy: testAccCheckParameterManagerParameterVersionDestroyProducer(t),
7269
Steps: []resource.TestStep{
7370
{
@@ -84,19 +81,16 @@ func TestAccDataSourceParameterManagerParameterVersion_basicWithParameterName(t
8481
func testAccParameterManagerParameterVersion_basicWithParameterName(context map[string]interface{}) string {
8582
return acctest.Nprintf(`
8683
resource "google_parameter_manager_parameter" "parameter-basic" {
87-
provider = google-beta
8884
parameter_id = "tf_test_parameter%{random_suffix}"
8985
}
9086
9187
resource "google_parameter_manager_parameter_version" "parameter-version-basic" {
92-
provider = google-beta
9388
parameter = google_parameter_manager_parameter.parameter-basic.id
9489
parameter_version_id = "tf_test_parameter_version%{random_suffix}"
9590
parameter_data = "test-parameter-data-with-parameter-name"
9691
}
9792
9893
data "google_parameter_manager_parameter_version" "parameter-version-basic" {
99-
provider = google-beta
10094
parameter = google_parameter_manager_parameter.parameter-basic.parameter_id
10195
parameter_version_id = google_parameter_manager_parameter_version.parameter-version-basic.parameter_version_id
10296
}
@@ -112,7 +106,7 @@ func TestAccDataSourceParameterManagerParameterVersion_withJsonData(t *testing.T
112106

113107
acctest.VcrTest(t, resource.TestCase{
114108
PreCheck: func() { acctest.AccTestPreCheck(t) },
115-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
109+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
116110
CheckDestroy: testAccCheckParameterManagerParameterVersionDestroyProducer(t),
117111
Steps: []resource.TestStep{
118112
{
@@ -129,13 +123,11 @@ func TestAccDataSourceParameterManagerParameterVersion_withJsonData(t *testing.T
129123
func testAccParameterManagerParameterVersion_withJsonData(context map[string]interface{}) string {
130124
return acctest.Nprintf(`
131125
resource "google_parameter_manager_parameter" "parameter-basic" {
132-
provider = google-beta
133126
parameter_id = "tf_test_parameter%{random_suffix}"
134127
format = "JSON"
135128
}
136129
137130
resource "google_parameter_manager_parameter_version" "parameter-version-with-json-data" {
138-
provider = google-beta
139131
parameter = google_parameter_manager_parameter.parameter-basic.id
140132
parameter_version_id = "tf_test_parameter_version%{random_suffix}"
141133
parameter_data = jsonencode({
@@ -145,7 +137,6 @@ resource "google_parameter_manager_parameter_version" "parameter-version-with-js
145137
}
146138
147139
data "google_parameter_manager_parameter_version" "parameter-version-with-json-data" {
148-
provider = google-beta
149140
parameter = google_parameter_manager_parameter_version.parameter-version-with-json-data.parameter
150141
parameter_version_id = google_parameter_manager_parameter_version.parameter-version-with-json-data.parameter_version_id
151142
}
@@ -161,7 +152,7 @@ func TestAccDataSourceParameterManagerParameterVersion_withYamlData(t *testing.T
161152

162153
acctest.VcrTest(t, resource.TestCase{
163154
PreCheck: func() { acctest.AccTestPreCheck(t) },
164-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
155+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
165156
CheckDestroy: testAccCheckParameterManagerParameterVersionDestroyProducer(t),
166157
Steps: []resource.TestStep{
167158
{
@@ -178,13 +169,11 @@ func TestAccDataSourceParameterManagerParameterVersion_withYamlData(t *testing.T
178169
func testAccParameterManagerParameterVersion_withYamlData(context map[string]interface{}) string {
179170
return acctest.Nprintf(`
180171
resource "google_parameter_manager_parameter" "parameter-basic" {
181-
provider = google-beta
182172
parameter_id = "tf_test_parameter%{random_suffix}"
183173
format = "YAML"
184174
}
185175
186176
resource "google_parameter_manager_parameter_version" "parameter-version-with-yaml-data" {
187-
provider = google-beta
188177
parameter = google_parameter_manager_parameter.parameter-basic.id
189178
parameter_version_id = "tf_test_parameter_version%{random_suffix}"
190179
parameter_data = yamlencode({
@@ -194,7 +183,6 @@ resource "google_parameter_manager_parameter_version" "parameter-version-with-ya
194183
}
195184
196185
data "google_parameter_manager_parameter_version" "parameter-version-with-yaml-data" {
197-
provider = google-beta
198186
parameter = google_parameter_manager_parameter_version.parameter-version-with-yaml-data.parameter
199187
parameter_version_id = google_parameter_manager_parameter_version.parameter-version-with-yaml-data.parameter_version_id
200188
}
@@ -218,7 +206,7 @@ func TestAccDataSourceParameterManagerParameterVersion_withKmsKey(t *testing.T)
218206

219207
acctest.VcrTest(t, resource.TestCase{
220208
PreCheck: func() { acctest.AccTestPreCheck(t) },
221-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
209+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
222210
CheckDestroy: testAccCheckParameterManagerParameterVersionDestroyProducer(t),
223211
Steps: []resource.TestStep{
224212
{
@@ -234,19 +222,15 @@ func TestAccDataSourceParameterManagerParameterVersion_withKmsKey(t *testing.T)
234222

235223
func testAccParameterManagerParameterVersion_withKmsKey(context map[string]interface{}) string {
236224
return acctest.Nprintf(`
237-
data "google_project" "project" {
238-
provider = google-beta
239-
}
225+
data "google_project" "project" {}
240226
241227
resource "google_parameter_manager_parameter" "parameter-basic" {
242-
provider = google-beta
243228
parameter_id = "tf_test_parameter%{random_suffix}"
244229
format = "YAML"
245230
kms_key = "%{kms_key}"
246231
}
247232
248233
resource "google_parameter_manager_parameter_version" "parameter-version-with-kms-key" {
249-
provider = google-beta
250234
parameter = google_parameter_manager_parameter.parameter-basic.id
251235
parameter_version_id = "tf_test_parameter_version%{random_suffix}"
252236
parameter_data = yamlencode({
@@ -256,7 +240,6 @@ resource "google_parameter_manager_parameter_version" "parameter-version-with-km
256240
}
257241
258242
data "google_parameter_manager_parameter_version" "parameter-version-with-kms-key" {
259-
provider = google-beta
260243
parameter = google_parameter_manager_parameter_version.parameter-version-with-kms-key.parameter
261244
parameter_version_id = google_parameter_manager_parameter_version.parameter-version-with-kms-key.parameter_version_id
262245
}

0 commit comments

Comments
 (0)