Skip to content

Commit e7e08ad

Browse files
committed
revert: activeactive database reverted to 2.7.2 behaviour
1 parent 9c48c91 commit e7e08ad

13 files changed

+119
-1132
lines changed

.github/workflows/terraform_provider_pr.yml

Lines changed: 30 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,6 @@ jobs:
5656
name: go build
5757
run: go build -o terraform-plugin-dir/registry.terraform.io/RedisLabs/rediscloud/99.99.99/$(go env GOOS)_$(go env GOARCH)/terraform-provider-rediscloud .
5858

59-
go_unit_test:
60-
name: go unit test
61-
needs: [go_build]
62-
runs-on: ubuntu-latest
63-
steps:
64-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
65-
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
66-
with:
67-
go-version-file: go.mod
68-
- run: go test ./... -run="^TestUnit" # Runs tests starting with TestUnit
69-
70-
tfproviderlint:
71-
name: tfproviderlint
72-
needs: [go_build]
73-
runs-on: ubuntu-latest
74-
steps:
75-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
76-
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
77-
with:
78-
go-version-file: go.mod
79-
- run: make tfproviderlint
80-
8159
terraform_providers_schema:
8260
name: terraform providers schema
8361
needs: [go_build]
@@ -124,7 +102,6 @@ jobs:
124102
mkdir terraform-providers-schema
125103
terraform providers schema -json > terraform-providers-schema/schema.json
126104
127-
# All acceptance tests run in parallel after quick tests
128105
go_test_smoke_aa_tgw_attachment:
129106
if: false # Temporarily disabled - TGW tests not ready yet
130107
name: go test smoke aa tgw attachment
@@ -137,20 +114,9 @@ jobs:
137114
go-version-file: go.mod
138115
- run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudActiveActiveTransitGatewayAttachment_CRUDI"'
139116

140-
go_test_smoke_aa_enable_default_user:
141-
name: go test smoke aa enable default user
142-
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
143-
runs-on: ubuntu-latest
144-
steps:
145-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
146-
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
147-
with:
148-
go-version-file: go.mod
149-
- run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudActiveActiveDatabase_enableDefaultUser"'
150-
151117
go_test_smoke_aa_db:
152118
name: go test smoke aa db
153-
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
119+
needs: [go_build]
154120
runs-on: ubuntu-latest
155121
steps:
156122
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -161,7 +127,7 @@ jobs:
161127

162128
go_test_smoke_essentials_sub:
163129
name: go test smoke essentials sub
164-
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
130+
needs: [go_build]
165131
runs-on: ubuntu-latest
166132
steps:
167133
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -185,7 +151,7 @@ jobs:
185151

186152
go_test_smoke_pro_db:
187153
name: go test smoke pro db
188-
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
154+
needs: [go_build]
189155
runs-on: ubuntu-latest
190156
steps:
191157
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -197,7 +163,7 @@ jobs:
197163

198164
go_test_smoke_misc:
199165
name: go test smoke misc
200-
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
166+
needs: [ go_build ]
201167
runs-on: ubuntu-latest
202168
steps:
203169
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -208,7 +174,7 @@ jobs:
208174

209175
go_test_pro_db_upgrade:
210176
name: go test smoke pro db upgrade
211-
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
177+
needs: [ go_build ]
212178
runs-on: ubuntu-latest
213179
steps:
214180
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -219,7 +185,7 @@ jobs:
219185

220186
go_test_privatelink:
221187
name: go test smoke privatelink
222-
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
188+
needs: [ go_build ]
223189
runs-on: ubuntu-latest
224190
steps:
225191
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -231,7 +197,7 @@ jobs:
231197

232198
go_test_block_public_endpoints:
233199
name: go test smoke public endpoints
234-
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
200+
needs: [ go_build ]
235201
runs-on: ubuntu-latest
236202
steps:
237203
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -242,11 +208,33 @@ jobs:
242208

243209
go_test_smoke_qpf:
244210
name: go test smoke query performance factor
245-
needs: [go_unit_test, tfproviderlint, terraform_providers_schema]
211+
needs: [ go_build ]
246212
runs-on: ubuntu-latest
247213
steps:
248214
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
249215
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
250216
with:
251217
go-version-file: go.mod
252218
- run: EXECUTE_TESTS=true make testacc TESTARGS='-run="TestAccResourceRedisCloudProDatabase_qpf"'
219+
220+
go_unit_test:
221+
name: go unit test
222+
needs: [go_build]
223+
runs-on: ubuntu-latest
224+
steps:
225+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
226+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
227+
with:
228+
go-version-file: go.mod
229+
- run: go test ./... -run="^TestUnit" # Runs tests starting with TestUnit
230+
231+
tfproviderlint:
232+
name: tfproviderlint
233+
needs: [go_build]
234+
runs-on: ubuntu-latest
235+
steps:
236+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
237+
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
238+
with:
239+
go-version-file: go.mod
240+
- run: make tfproviderlint

provider/activeactive/testdata/enable_default_user_all_explicit.tf

Lines changed: 0 additions & 54 deletions
This file was deleted.

provider/activeactive/testdata/enable_default_user_global_false_region_true.tf

Lines changed: 0 additions & 53 deletions
This file was deleted.

provider/activeactive/testdata/enable_default_user_global_true_inherit.tf

Lines changed: 0 additions & 52 deletions
This file was deleted.

provider/activeactive/testdata/enable_default_user_mixed_overrides.tf

Lines changed: 0 additions & 53 deletions
This file was deleted.

provider/datasource_rediscloud_essentials_database.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package provider
22

33
import (
44
"context"
5-
65
"github.com/RedisLabs/rediscloud-go-api/redis"
76
fixedDatabases "github.com/RedisLabs/rediscloud-go-api/service/fixed/databases"
87
"github.com/RedisLabs/terraform-provider-rediscloud/provider/client"

0 commit comments

Comments
 (0)