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

Jump to bottom

Simplify Google Cloud credential detection #502

Merged
merged 3 commits into from
Apr 14, 2022
Merged

Simplify Google Cloud credential detection #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b38c52
Simplify Google Cloud credential detection
0x2b3bfa0 Apr 14, 2022
5ac6b85
Update golden tests
0x2b3bfa0 Apr 14, 2022
9759267
Update helpers.go
0x2b3bfa0 Apr 14, 2022
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
18 changes: 9 additions & 9 deletions iterative/gcp/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,14 @@ func ResourceMachineDelete(ctx context.Context, d *schema.ResourceData, m interf
return nil
}

func LoadGCPCredentials() (*google.Credentials, error) {
if credentialsData := os.Getenv("GOOGLE_APPLICATION_CREDENTIALS_DATA"); credentialsData != "" {
return google.CredentialsFromJSON(oauth2.NoContext, []byte(credentialsData), gcp_compute.ComputeScope)
}

return google.FindDefaultCredentials(oauth2.NoContext, gcp_compute.ComputeScope)
}

func getServiceAccountData(saString string) (string, []string) {
// ["SA email", "scopes=s1", "s2", ...]
splitStr := strings.Split(saString, ",")
Expand All @@ -305,15 +313,7 @@ func getServiceAccountData(saString string) (string, []string) {
}

func getProjectService() (string, *gcp_compute.Service, error) {
var credentials *google.Credentials
var err error

if credentialsData := []byte(utils.LoadGCPCredentials()); len(credentialsData) > 0 {
credentials, err = google.CredentialsFromJSON(oauth2.NoContext, credentialsData, gcp_compute.ComputeScope)
} else {
credentials, err = google.FindDefaultCredentials(oauth2.NoContext, gcp_compute.ComputeScope)
}

credentials, err := LoadGCPCredentials()
if err != nil {
return "", nil, err
}
Expand Down
8 changes: 7 additions & 1 deletion iterative/resource_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (

"gopkg.in/alessio/shellescape.v1"

"terraform-provider-iterative/iterative/gcp"
"terraform-provider-iterative/iterative/utils"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
Expand Down Expand Up @@ -435,6 +436,11 @@ func provisionerCode(d *schema.ResourceData) (string, error) {
return code, err
}

var gcpCredentials string
if credentials, err := gcp.LoadGCPCredentials(); err == nil {
gcpCredentials = string(credentials.JSON)
}

data := make(map[string]interface{})
data["token"] = d.Get("token").(string)
data["repo"] = d.Get("repo").(string)
Expand All @@ -455,7 +461,7 @@ func provisionerCode(d *schema.ResourceData) (string, error) {
data["AZURE_CLIENT_SECRET"] = os.Getenv("AZURE_CLIENT_SECRET")
data["AZURE_SUBSCRIPTION_ID"] = os.Getenv("AZURE_SUBSCRIPTION_ID")
data["AZURE_TENANT_ID"] = os.Getenv("AZURE_TENANT_ID")
data["GOOGLE_APPLICATION_CREDENTIALS_DATA"] = utils.LoadGCPCredentials()
data["GOOGLE_APPLICATION_CREDENTIALS_DATA"] = gcpCredentials
data["KUBERNETES_CONFIGURATION"] = os.Getenv("KUBERNETES_CONFIGURATION")
data["container"] = isContainerAvailable(d.Get("cloud").(string))
data["setup"] = strings.Replace(string(setup[:]), "#/bin/sh", "", 1)
Expand Down
2 changes: 1 addition & 1 deletion iterative/testdata/script_template_cloud_gcp.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fi
sudo npm config set user 0 && sudo npm install --global 18 value with "quotes" and spaces
sudo tee /usr/bin/cml.sh << 'EOF'
#!/bin/sh
export GOOGLE_APPLICATION_CREDENTIALS_DATA='7 value with "quotes" and spaces'
export GOOGLE_APPLICATION_CREDENTIALS_DATA=''
dacbd marked this conversation as resolved.
Show resolved Hide resolved

HOME="$(mktemp -d)" exec $(which cml-runner || echo $(which cml-internal || echo cml) runner) \
--name '10 value with "quotes" and spaces' \
Expand Down
12 changes: 0 additions & 12 deletions iterative/utils/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,6 @@ func GCPCoerceOIDCCredentials(rawCreds []byte) (string, error) {
return projectID, nil
}

func LoadGCPCredentials() string {
credentialsData := os.Getenv("GOOGLE_APPLICATION_CREDENTIALS_DATA")
if len(credentialsData) == 0 {
credentialsPath := os.Getenv("GOOGLE_APPLICATION_CREDENTIALS")
if len(credentialsPath) > 0 {
jsonData, _ := os.ReadFile(credentialsPath)
credentialsData = string(jsonData)
}
}
return credentialsData
}

// Better way than copying?
// https://github.com/hashicorp/terraform-provider-google/blob/8a362008bd4d36b6a882eb53455f87305e6dff52/google/service_scope.go#L5-L48
func canonicalizeServiceScope(scope string) string {
Expand Down