Skip to content

Commit 4a24799

Browse files
authored
Point to provider version 2.1 and run acceptance tests (#3)
* Configure connection to GCP to run tests * Point to provider release v2.1 * Update docs * Add timeout and parallel settings * Fix cache action and increase timeout
1 parent 77dfa0e commit 4a24799

File tree

7 files changed

+32
-27
lines changed

7 files changed

+32
-27
lines changed

.github/workflows/build.yml

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,32 +51,29 @@ jobs:
5151
steps:
5252
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5353

54-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
55-
continue-on-error: true
56-
id: cache-terraform-plugin-dir
57-
timeout-minutes: 2
58-
with:
59-
path: terraform-plugin-dir
60-
key: ${{ runner.os }}-terraform-plugin-dir-${{ hashFiles('go.sum') }}-${{ hashFiles('provider/**') }}
61-
62-
- if: steps.cache-terraform-plugin-dir.outputs.cache-hit != 'true' || steps.cache-terraform-plugin-dir.outcome == 'failure'
63-
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
54+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
6455
with:
6556
go-version-file: go.mod
6657

67-
- if: steps.cache-terraform-plugin-dir.outputs.cache-hit != 'true' || steps.cache-terraform-plugin-dir.outcome == 'failure'
68-
name: go mod download
58+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
59+
with:
60+
path: |
61+
~/.cache/go-build
62+
~/go/pkg/mod
63+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
64+
restore-keys: |
65+
${{ runner.os }}-go-
66+
67+
- name: go mod download
6968
run: go mod download
7069

71-
- if: steps.cache-terraform-plugin-dir.outputs.cache-hit != 'true' || steps.cache-terraform-plugin-dir.outcome == 'failure'
72-
name: go build
70+
- name: go build
7371
run: go build ./...
7472

7573
go_test:
7674
name: go test
7775
needs: [go_build]
7876
runs-on: ubuntu-latest
79-
if: false # TODO Set up acceptance tests
8077
steps:
8178
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8279

@@ -99,12 +96,20 @@ jobs:
9996
- 'modules/**'
10097
- '.github/workflows/**'
10198
102-
- run: go test ./test
99+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
100+
with:
101+
path: |
102+
~/.cache/go-build
103+
~/go/pkg/mod
104+
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
105+
restore-keys: |
106+
${{ runner.os }}-go-
107+
108+
- run: go test ./test -timeout 90m -p=1 -parallel=2
103109
if: steps.filter.outputs.code-changes == 'true'
104110
env:
105111
REDISCLOUD_ACCESS_KEY: ${{ secrets.REDISCLOUD_ACCESS_KEY }}
106112
REDISCLOUD_SECRET_KEY: ${{ secrets.REDISCLOUD_SECRET_KEY }}
107113
REDISCLOUD_URL: ${{ secrets.REDISCLOUD_URL }}
108-
GCP_PROJECT_ID: ${{ secrets.GCP_VPC_PROJECT_ID }}
109-
# TODO
110-
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
114+
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
115+
GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}

examples/active_active/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
rediscloud = {
55
source = "RedisLabs/rediscloud"
6-
version = "~> 2.0" # TODO Bump to 2.1
6+
version = "~> 2.1"
77
}
88
google = {
99
source = "hashicorp/google"

examples/pro/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
rediscloud = {
55
source = "RedisLabs/rediscloud"
6-
version = "~> 2.0" # TODO Bump to 2.1
6+
version = "~> 2.1"
77
}
88
google = {
99
source = "hashicorp/google"

modules/active_active_private_service_connect/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ rules and DNS entries a particular GCP subnetwork.
99
| Name | Version |
1010
|------|---------|
1111
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.2 |
12-
| <a name="requirement_rediscloud"></a> [rediscloud](#requirement\_rediscloud) | ~> 2.0 |
12+
| <a name="requirement_rediscloud"></a> [rediscloud](#requirement\_rediscloud) | ~> 2.1 |
1313

1414
## Providers
1515

1616
| Name | Version |
1717
|------|---------|
18-
| <a name="provider_rediscloud"></a> [rediscloud](#provider\_rediscloud) | ~> 2.0 |
18+
| <a name="provider_rediscloud"></a> [rediscloud](#provider\_rediscloud) | ~> 2.1 |
1919

2020
## Modules
2121

modules/active_active_private_service_connect/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
rediscloud = {
55
source = "RedisLabs/rediscloud"
6-
version = "~> 2.0" # TODO Bump to 2.1
6+
version = "~> 2.1"
77
}
88
}
99
}

modules/private_service_connect/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ rules and DNS entries a particular GCP subnetwork.
99
| Name | Version |
1010
|------|---------|
1111
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.2 |
12-
| <a name="requirement_rediscloud"></a> [rediscloud](#requirement\_rediscloud) | ~> 2.0 |
12+
| <a name="requirement_rediscloud"></a> [rediscloud](#requirement\_rediscloud) | ~> 2.1 |
1313

1414
## Providers
1515

1616
| Name | Version |
1717
|------|---------|
18-
| <a name="provider_rediscloud"></a> [rediscloud](#provider\_rediscloud) | ~> 2.0 |
18+
| <a name="provider_rediscloud"></a> [rediscloud](#provider\_rediscloud) | ~> 2.1 |
1919

2020
## Modules
2121

modules/private_service_connect/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
rediscloud = {
55
source = "RedisLabs/rediscloud"
6-
version = "~> 2.0" # TODO Bump to 2.1
6+
version = "~> 2.1"
77
}
88
}
99
}

0 commit comments

Comments
 (0)