Skip to content

Commit 62b07b4

Browse files
authored
Merge branch 'main' into dependabot/go_modules/github.com/hashicorp/terraform-plugin-framework-validators-0.16.0
2 parents 84af650 + 4e579c1 commit 62b07b4

File tree

6 files changed

+22
-53
lines changed

6 files changed

+22
-53
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
version: latest
3030

3131
generate:
32-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-22.04
3333
steps:
3434
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
3535
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1

.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ linters:
1414
- forcetypeassert
1515
- godot
1616
- gofmt
17-
- gomnd
1817
- gosimple
1918
- govet
2019
- ineffassign

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ require (
8181
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
8282
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
8383
github.com/zclconf/go-cty v1.15.0 // indirect
84-
golang.org/x/crypto v0.26.0 // indirect
84+
golang.org/x/crypto v0.31.0 // indirect
8585
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect
8686
golang.org/x/mod v0.19.0 // indirect
8787
golang.org/x/net v0.28.0 // indirect
88-
golang.org/x/sync v0.8.0 // indirect
89-
golang.org/x/sys v0.24.0 // indirect
90-
golang.org/x/term v0.23.0 // indirect
91-
golang.org/x/text v0.17.0 // indirect
88+
golang.org/x/sync v0.10.0 // indirect
89+
golang.org/x/sys v0.28.0 // indirect
90+
golang.org/x/term v0.27.0 // indirect
91+
golang.org/x/text v0.21.0 // indirect
9292
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
9393
google.golang.org/appengine v1.6.8 // indirect
9494
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIi
230230
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
231231
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
232232
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
233-
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
234-
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
233+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
234+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
235235
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 h1:EDuYyU/MkFXllv9QF9819VlI9a4tzGuCbhG0ExK9o1U=
236236
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
237237
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -263,8 +263,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
263263
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
264264
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
265265
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
266-
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
267-
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
266+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
267+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
268268
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
269269
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
270270
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -287,8 +287,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
287287
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
288288
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
289289
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
290-
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
291-
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
290+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
291+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
292292
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
293293
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
294294
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -300,8 +300,8 @@ golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
300300
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
301301
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
302302
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
303-
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
304-
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
303+
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
304+
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
305305
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
306306
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
307307
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -313,8 +313,8 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
313313
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
314314
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
315315
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
316-
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
317-
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
316+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
317+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
318318
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
319319
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
320320
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

internal/provider/reverse_etl_model_resource.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@ func (r *reverseETLModelResource) Read(ctx context.Context, req resource.ReadReq
187187
}
188188

189189
// Since we deprecated these values, we just need to set them to the plan values so there are no errors
190-
if !previousState.ScheduleConfig.IsNull() && !previousState.ScheduleConfig.IsUnknown() {
190+
if !previousState.ScheduleConfig.IsUnknown() {
191191
resp.State.SetAttribute(ctx, path.Root("schedule_config"), previousState.ScheduleConfig)
192192
}
193-
if !previousState.ScheduleStrategy.IsNull() && !previousState.ScheduleStrategy.IsUnknown() {
193+
if !previousState.ScheduleStrategy.IsUnknown() {
194194
resp.State.SetAttribute(ctx, path.Root("schedule_strategy"), previousState.ScheduleStrategy)
195195
}
196196
}

internal/provider/reverse_etl_model_resource_test.go

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ func TestAccReverseETLModelResource(t *testing.T) {
2828
"description": "My reverse etl model description",
2929
"enabled": true,
3030
"query": "SELECT hi FROM greetings",
31-
"queryIdentifierColumn": "hi",
32-
"scheduleStrategy": "SPECIFIC_DAYS",
33-
"scheduleConfig": {"days":[0,1,2,3],"hours":[0,1,3,2],"timezone":"America/Los_Angeles"}
31+
"queryIdentifierColumn": "hi"
3432
}
3533
}
3634
}
@@ -46,9 +44,7 @@ func TestAccReverseETLModelResource(t *testing.T) {
4644
"description": "My new reverse etl model description",
4745
"enabled": false,
4846
"query": "SELECT hello FROM greetings",
49-
"queryIdentifierColumn": "hello",
50-
"scheduleStrategy": "SPECIFIC_DAYS",
51-
"scheduleConfig": {"days":[0,1,2,3,4],"hours":[0,1,5],"timezone":"America/Los_Angeles"}
47+
"queryIdentifierColumn": "hello"
5248
}
5349
}
5450
}
@@ -66,9 +62,7 @@ func TestAccReverseETLModelResource(t *testing.T) {
6662
"description": "My reverse etl model description",
6763
"enabled": true,
6864
"query": "SELECT hi FROM greetings",
69-
"queryIdentifierColumn": "hi",
70-
"scheduleStrategy": "SPECIFIC_DAYS",
71-
"scheduleConfig": {"days":[0,1,2,3],"hours":[0,1,3,2],"timezone":"America/Los_Angeles"}
65+
"queryIdentifierColumn": "hi"
7266
}
7367
}
7468
}
@@ -84,9 +78,7 @@ func TestAccReverseETLModelResource(t *testing.T) {
8478
"description": "My new reverse etl model description",
8579
"enabled": false,
8680
"query": "SELECT hello FROM greetings",
87-
"queryIdentifierColumn": "hello",
88-
"scheduleStrategy": "SPECIFIC_DAYS",
89-
"scheduleConfig": {"days":[0,1,2,3,4],"hours":[0,1,5],"timezone":"America/Los_Angeles"}
81+
"queryIdentifierColumn": "hello"
9082
}
9183
}
9284
}
@@ -117,14 +109,8 @@ func TestAccReverseETLModelResource(t *testing.T) {
117109
name = "My reverse etl model name"
118110
enabled = true
119111
description = "My reverse etl model description"
120-
schedule_strategy = "SPECIFIC_DAYS"
121112
query = "SELECT hi FROM greetings"
122113
query_identifier_column = "hi"
123-
schedule_config = jsonencode({
124-
"days": [0, 1, 2, 3],
125-
"hours": [0, 1, 3, 2],
126-
"timezone": "America/Los_Angeles"
127-
})
128114
}
129115
`,
130116
Check: resource.ComposeAggregateTestCheckFunc(
@@ -133,10 +119,8 @@ func TestAccReverseETLModelResource(t *testing.T) {
133119
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "name", "My reverse etl model name"),
134120
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "enabled", "true"),
135121
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "description", "My reverse etl model description"),
136-
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "schedule_strategy", "SPECIFIC_DAYS"),
137122
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "query", "SELECT hi FROM greetings"),
138123
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "query_identifier_column", "hi"),
139-
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "schedule_config", "{\"days\":[0,1,2,3],\"hours\":[0,1,3,2],\"timezone\":\"America/Los_Angeles\"}"),
140124
),
141125
},
142126
// ImportState testing
@@ -148,14 +132,8 @@ func TestAccReverseETLModelResource(t *testing.T) {
148132
name = "My reverse etl model name"
149133
enabled = true
150134
description = "My reverse etl model description"
151-
schedule_strategy = "SPECIFIC_DAYS"
152135
query = "SELECT hi FROM greetings"
153136
query_identifier_column = "hi"
154-
schedule_config = jsonencode({
155-
"days": [0, 1, 2, 3],
156-
"hours": [0, 1, 3, 2],
157-
"timezone": "America/Los_Angeles"
158-
})
159137
}
160138
`,
161139
ImportState: true,
@@ -169,14 +147,8 @@ func TestAccReverseETLModelResource(t *testing.T) {
169147
name = "My new reverse etl model name"
170148
enabled = false
171149
description = "My new reverse etl model description"
172-
schedule_strategy = "SPECIFIC_DAYS"
173150
query = "SELECT hello FROM greetings"
174151
query_identifier_column = "hello"
175-
schedule_config = jsonencode({
176-
"days": [0, 1, 2, 3, 4],
177-
"hours": [0, 1, 5],
178-
"timezone": "America/Los_Angeles"
179-
})
180152
}
181153
`,
182154
Check: resource.ComposeAggregateTestCheckFunc(
@@ -185,10 +157,8 @@ func TestAccReverseETLModelResource(t *testing.T) {
185157
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "name", "My new reverse etl model name"),
186158
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "enabled", "false"),
187159
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "description", "My new reverse etl model description"),
188-
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "schedule_strategy", "SPECIFIC_DAYS"),
189160
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "query", "SELECT hello FROM greetings"),
190161
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "query_identifier_column", "hello"),
191-
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "schedule_config", "{\"days\":[0,1,2,3,4],\"hours\":[0,1,5],\"timezone\":\"America/Los_Angeles\"}"),
192162
),
193163
},
194164
// Delete testing automatically occurs in TestCase

0 commit comments

Comments
 (0)