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.

Sign up for GitHub

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

provider: adjust credential logic for hub-stage #45

Merged
merged 1 commit into from
Aug 28, 2024
Merged

provider: adjust credential logic for hub-stage #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions .github/workflows/acctest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Acceptance Tests

on:
workflow_dispatch:
inputs:
ref:
inputs:
ref:
description: 'The ref to checkout e.g the SHA of a fork in PR'
type: string
required: false
default: 'main'
tests:
tests:
description: 'The TESTS pattern to supply to `make testacc`. Default is all tests.'
type: string
required: false
Expand Down Expand Up @@ -39,11 +39,16 @@ jobs:
terraform_version: ${{ inputs.terraform-version }}
terraform_wrapper: false

- uses: docker/login-action@v2
with:
username: ${{ vars.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
registry: index-stage.docker.io

- run: |
make testacc TESTS='${{ inputs.tests }}'
env:
DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
DOCKER_PASSWORD: "${{ secrets.DOCKER_PASSWORD }}"
DOCKER_USERNAME: ${{ vars.DOCKER_USERNAME }}
DOCKER_HUB_HOST: "hub-stage.docker.com"
TF_ACC: "1"
timeout-minutes: 30
4 changes: 4 additions & 0 deletions internal/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ import (
var hostRegexp = regexp.MustCompile(`^[a-zA-Z0-9:.-]+$`)

const dockerHubConfigfileKey = "https://index.docker.io/v1/"
const dockerHubStageConfigfileKey = "index-stage.docker.io"
const dockerHubHost = "hub.docker.com"
const dockerHubStageHost = "hub-stage.docker.com"

// Ensure DockerProvider satisfies various provider interfaces.
var (
Expand Down Expand Up @@ -145,6 +147,8 @@ func (p *DockerProvider) Configure(ctx context.Context, req provider.ConfigureRe
configfileKey := host
if host == dockerHubHost {
configfileKey = dockerHubConfigfileKey
} else if host == dockerHubStageHost {
configfileKey = dockerHubStageConfigfileKey
}

// Use the getUserCreds function to retrieve credentials from Docker config
Expand Down
3 changes: 0 additions & 3 deletions internal/provider/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,4 @@ func testAccPreCheck(t *testing.T) {
if v := os.Getenv("DOCKER_USERNAME"); v == "" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't expect DOCKER_USERNAME to be set either with the new auth method

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ya...i hit this too.

the way that the AWS provider handles this is that there's a aws_caller_identity data resource
https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity

and then you'd use that in the acceptance tests, rather than pulling from DOCKER_USERNAME. what do you think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah i like that, do you know any api's off the top of your head that could get us that info?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well, for the base case, we don't need to even call any apis, the provider can return what it has 😛
#46

t.Fatal("DOCKER_USERNAME must be set for acceptance tests")
}
if v := os.Getenv("DOCKER_PASSWORD"); v == "" {
t.Fatal("DOCKER_PASSWORD must be set for acceptance tests")
}
}
Loading