Reverse env var provisioner and importer order · 1Password/shell-plugins@649277a · GitHub
Skip to content

Commit 649277a

Browse files
florisvdgflorisvdg
committed
Reverse env var provisioner and importer order
1 parent 71035f1 commit 649277a

19 files changed

Lines changed: 88 additions & 88 deletions

File tree

‎cmd/contrib/main.go‎

Lines changed: 2 additions & 2 deletions

‎plugins/aws/access_key.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -63,30 +63,30 @@ func AccessKey() schema.CredentialType {
6363
DefaultProvisioner: AWSProvisioner(),
6464
Importer: importer.TryAll(
6565
importer.TryEnvVarPair(defaultEnvVarMapping),
66-
importer.TryEnvVarPair(map[sdk.FieldName]string{
67-
fieldname.AccessKeyID: "AMAZON_ACCESS_KEY_ID",
68-
fieldname.SecretAccessKey: "AMAZON_SECRET_ACCESS_KEY",
69-
fieldname.DefaultRegion: "AWS_DEFAULT_REGION",
66+
importer.TryEnvVarPair(map[string]sdk.FieldName{
67+
"AMAZON_ACCESS_KEY_ID": fieldname.AccessKeyID,
68+
"AMAZON_SECRET_ACCESS_KEY": fieldname.SecretAccessKey,
69+
"AWS_DEFAULT_REGION": fieldname.DefaultRegion,
7070
}),
71-
importer.TryEnvVarPair(map[sdk.FieldName]string{
72-
fieldname.AccessKeyID: "AWS_ACCESS_KEY",
73-
fieldname.SecretAccessKey: "AWS_SECRET_KEY",
74-
fieldname.DefaultRegion: "AWS_DEFAULT_REGION",
71+
importer.TryEnvVarPair(map[string]sdk.FieldName{
72+
"AWS_ACCESS_KEY": fieldname.AccessKeyID,
73+
"AWS_SECRET_KEY": fieldname.SecretAccessKey,
74+
"AWS_DEFAULT_REGION": fieldname.DefaultRegion,
7575
}),
76-
importer.TryEnvVarPair(map[sdk.FieldName]string{
77-
fieldname.AccessKeyID: "AWS_ACCESS_KEY",
78-
fieldname.SecretAccessKey: "AWS_ACCESS_SECRET",
79-
fieldname.DefaultRegion: "AWS_DEFAULT_REGION",
76+
importer.TryEnvVarPair(map[string]sdk.FieldName{
77+
"AWS_ACCESS_KEY": fieldname.AccessKeyID,
78+
"AWS_ACCESS_SECRET": fieldname.SecretAccessKey,
79+
"AWS_DEFAULT_REGION": fieldname.DefaultRegion,
8080
}),
8181
TryCredentialsFile(),
8282
),
8383
}
8484
}
8585

86-
var defaultEnvVarMapping = map[sdk.FieldName]string{
87-
fieldname.AccessKeyID: "AWS_ACCESS_KEY_ID",
88-
fieldname.SecretAccessKey: "AWS_SECRET_ACCESS_KEY",
89-
fieldname.DefaultRegion: "AWS_DEFAULT_REGION",
86+
var defaultEnvVarMapping = map[string]sdk.FieldName{
87+
"AWS_ACCESS_KEY_ID": fieldname.AccessKeyID,
88+
"AWS_SECRET_ACCESS_KEY": fieldname.SecretAccessKey,
89+
"AWS_DEFAULT_REGION": fieldname.DefaultRegion,
9090
}
9191

9292
// TryCredentialsFile looks for the access key in the ~/.aws/credentials file.

‎plugins/circleci/personal_api_token.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ func PersonalAPIToken() schema.CredentialType {
3030
},
3131
},
3232
},
33-
DefaultProvisioner: provision.EnvVars(map[sdk.FieldName]string{
34-
fieldname.Token: "CIRCLECI_CLI_TOKEN",
33+
DefaultProvisioner: provision.EnvVars(map[string]sdk.FieldName{
34+
"CIRCLECI_CLI_TOKEN": fieldname.Token,
3535
}),
3636
Importer: importer.TryAll(
37-
importer.TryEnvVarPair(map[sdk.FieldName]string{
38-
fieldname.Token: "CIRCLECI_CLI_TOKEN",
37+
importer.TryEnvVarPair(map[string]sdk.FieldName{
38+
"CIRCLECI_CLI_TOKEN": fieldname.Token,
3939
}),
4040
TryCircleCIConfigFile(),
4141
),

‎plugins/datadog/api_key.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ func APIKey() schema.CredentialType {
4848
}
4949
}
5050

51-
var defaultEnvVarMapping = map[sdk.FieldName]string{
52-
fieldname.APIKey: "DATADOG_API_KEY",
53-
fieldname.AppKey: "DATADOG_APP_KEY",
51+
var defaultEnvVarMapping = map[string]sdk.FieldName{
52+
"DATADOG_API_KEY": fieldname.APIKey,
53+
"DATADOG_APP_KEY": fieldname.AppKey,
5454
}
5555

5656
func TryDogrcFile() sdk.Importer {

‎plugins/digitalocean/personal_access_token.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ func PersonalAccessToken() schema.CredentialType {
2929
},
3030
},
3131
},
32-
DefaultProvisioner: provision.EnvVars(map[sdk.FieldName]string{
33-
fieldname.Token: "DIGITALOCEAN_ACCESS_TOKEN",
32+
DefaultProvisioner: provision.EnvVars(map[string]sdk.FieldName{
33+
"DIGITALOCEAN_ACCESS_TOKEN": fieldname.Token,
3434
}),
3535
Importer: importer.TryAllEnvVars(fieldname.Token, "DIGITALOCEAN_ACCESS_TOKEN"),
3636
}

‎plugins/fossa/api_key.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ func APIKey() schema.CredentialType {
3333
}
3434
}
3535

36-
var defaultEnvVarMapping = map[sdk.FieldName]string{
37-
fieldname.APIKey: "FOSSA_API_KEY",
36+
var defaultEnvVarMapping = map[string]sdk.FieldName{
37+
"FOSSA_API_KEY": fieldname.APIKey,
3838
}

‎plugins/github/personal_access_token.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,26 @@ func PersonalAccessToken() schema.CredentialType {
3939
Importer: importer.TryAll(
4040
importer.TryEnvVarPair(defaultEnvVarMapping),
4141
importer.TryAllEnvVars(fieldname.Token, "GH_TOKEN", "GITHUB_PAT"),
42-
importer.TryEnvVarPair(map[sdk.FieldName]string{
43-
fieldname.Host: "GH_HOST",
44-
fieldname.Token: "GH_ENTERPRISE_TOKEN",
42+
importer.TryEnvVarPair(map[string]sdk.FieldName{
43+
"GH_HOST": fieldname.Host,
44+
"GH_ENTERPRISE_TOKEN": fieldname.Token,
4545
}),
46-
importer.TryEnvVarPair(map[sdk.FieldName]string{
47-
fieldname.Host: "GH_HOST",
48-
fieldname.Token: "GITHUB_ENTERPRISE_TOKEN",
46+
importer.TryEnvVarPair(map[string]sdk.FieldName{
47+
"GH_HOST": fieldname.Host,
48+
"GITHUB_ENTERPRISE_TOKEN": fieldname.Token,
4949
}),
50-
importer.TryEnvVarPair(map[sdk.FieldName]string{
51-
fieldname.Host: "GH_HOST",
52-
fieldname.Token: "GH_TOKEN",
50+
importer.TryEnvVarPair(map[string]sdk.FieldName{
51+
"GH_HOST": fieldname.Host,
52+
"GH_TOKEN": fieldname.Token,
5353
}),
54-
importer.TryEnvVarPair(map[sdk.FieldName]string{
55-
fieldname.Host: "GH_HOST",
56-
fieldname.Token: "GITHUB_TOKEN",
54+
importer.TryEnvVarPair(map[string]sdk.FieldName{
55+
"GH_HOST": fieldname.Host,
56+
"GITHUB_TOKEN": fieldname.Token,
5757
}),
5858
),
5959
}
6060
}
6161

62-
var defaultEnvVarMapping = map[sdk.FieldName]string{
63-
fieldname.Token: "GITHUB_TOKEN",
62+
var defaultEnvVarMapping = map[string]sdk.FieldName{
63+
"GITHUB_TOKEN": fieldname.Token,
6464
}

‎plugins/gitlab/personal_access_token.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ func PersonalAccessToken() schema.CredentialType {
5050
}
5151
}
5252

53-
var defaultEnvVarMapping = map[sdk.FieldName]string{
54-
fieldname.Token: "GITLAB_TOKEN",
55-
fieldname.Host: "GITLAB_HOST",
56-
fieldname.APIHost: "GITLAB_API_HOST",
53+
var defaultEnvVarMapping = map[string]sdk.FieldName{
54+
"GITLAB_TOKEN": fieldname.Token,
55+
"GITLAB_HOST": fieldname.Host,
56+
"GITLAB_API_HOST": fieldname.APIHost,
5757
}
5858

5959
func TryGlabConfigFile() sdk.Importer {

‎plugins/heroku/api_key.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ func APIKey() schema.CredentialType {
3232
},
3333
},
3434
},
35-
DefaultProvisioner: provision.EnvVars(map[sdk.FieldName]string{
36-
fieldname.APIKey: "HEROKU_API_KEY",
35+
DefaultProvisioner: provision.EnvVars(map[string]sdk.FieldName{
36+
"HEROKU_API_KEY": fieldname.APIKey,
3737
}),
3838
Importer: importer.TryAll(
3939
importer.TryAllEnvVars(fieldname.APIKey, "HEROKU_API_KEY"),

‎plugins/okta/api_token.go‎

Lines changed: 3 additions & 3 deletions

0 commit comments

Comments
 (0)