Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Point to provider version 2.1 and run acceptance tests #3

Merged
merged 5 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,32 +51,29 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
continue-on-error: true
id: cache-terraform-plugin-dir
timeout-minutes: 2
with:
path: terraform-plugin-dir
key: ${{ runner.os }}-terraform-plugin-dir-${{ hashFiles('go.sum') }}-${{ hashFiles('provider/**') }}

- if: steps.cache-terraform-plugin-dir.outputs.cache-hit != 'true' || steps.cache-terraform-plugin-dir.outcome == 'failure'
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version-file: go.mod

- if: steps.cache-terraform-plugin-dir.outputs.cache-hit != 'true' || steps.cache-terraform-plugin-dir.outcome == 'failure'
name: go mod download
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-

- name: go mod download
run: go mod download

- if: steps.cache-terraform-plugin-dir.outputs.cache-hit != 'true' || steps.cache-terraform-plugin-dir.outcome == 'failure'
name: go build
- name: go build
run: go build ./...

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

Expand All @@ -99,12 +96,20 @@ jobs:
- 'modules/**'
- '.github/workflows/**'

- run: go test ./test
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-

- run: go test ./test -timeout 90m -p=1 -parallel=2
if: steps.filter.outputs.code-changes == 'true'
env:
REDISCLOUD_ACCESS_KEY: ${{ secrets.REDISCLOUD_ACCESS_KEY }}
REDISCLOUD_SECRET_KEY: ${{ secrets.REDISCLOUD_SECRET_KEY }}
REDISCLOUD_URL: ${{ secrets.REDISCLOUD_URL }}
GCP_PROJECT_ID: ${{ secrets.GCP_VPC_PROJECT_ID }}
# TODO
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
2 changes: 1 addition & 1 deletion examples/active_active/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
rediscloud = {
source = "RedisLabs/rediscloud"
version = "~> 2.0" # TODO Bump to 2.1
version = "~> 2.1"
}
google = {
source = "hashicorp/google"
Expand Down
2 changes: 1 addition & 1 deletion examples/pro/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
rediscloud = {
source = "RedisLabs/rediscloud"
version = "~> 2.0" # TODO Bump to 2.1
version = "~> 2.1"
}
google = {
source = "hashicorp/google"
Expand Down
4 changes: 2 additions & 2 deletions modules/active_active_private_service_connect/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ rules and DNS entries a particular GCP subnetwork.
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.2 |
| <a name="requirement_rediscloud"></a> [rediscloud](#requirement\_rediscloud) | ~> 2.0 |
| <a name="requirement_rediscloud"></a> [rediscloud](#requirement\_rediscloud) | ~> 2.1 |

## Providers

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

## Modules

Expand Down
2 changes: 1 addition & 1 deletion modules/active_active_private_service_connect/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
rediscloud = {
source = "RedisLabs/rediscloud"
version = "~> 2.0" # TODO Bump to 2.1
version = "~> 2.1"
}
}
}
4 changes: 2 additions & 2 deletions modules/private_service_connect/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ rules and DNS entries a particular GCP subnetwork.
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.2 |
| <a name="requirement_rediscloud"></a> [rediscloud](#requirement\_rediscloud) | ~> 2.0 |
| <a name="requirement_rediscloud"></a> [rediscloud](#requirement\_rediscloud) | ~> 2.1 |

## Providers

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

## Modules

Expand Down
2 changes: 1 addition & 1 deletion modules/private_service_connect/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
rediscloud = {
source = "RedisLabs/rediscloud"
version = "~> 2.0" # TODO Bump to 2.1
version = "~> 2.1"
}
}
}
Loading