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

feat(sentry): add SENTRY_PROJECT & SENTRY_URL #363

Merged
merged 2 commits into from Aug 15, 2023
Merged

feat(sentry): add SENTRY_PROJECT & SENTRY_URL #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf5350f
add additional config env vars
JoeKarow Aug 2, 2023
f937036
fix test values
JoeKarow Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 21 additions & 1 deletion plugins/sentry/auth_token.go
View file
Open in desktop
Expand Up @@ -31,7 +31,17 @@ func AuthToken() schema.CredentialType {
},
{
Name: fieldname.Organization,
MarkdownDescription: "The default organization used for this auth token.",
MarkdownDescription: "The slug of the organization to use for commands.",
Optional: true,
},
{
Name: fieldname.Project,
MarkdownDescription: "The slug of the project to use for commands.",
Optional: true,
},
{
Name: fieldname.URL,
MarkdownDescription: "The URL to use to connect to Sentry. This defaults to 'https://sentry.io/' but can be overridden for self-hosted instances.",
Optional: true,
},
},
Expand All @@ -46,6 +56,8 @@ func AuthToken() schema.CredentialType {
var defaultEnvVarMapping = map[string]sdk.FieldName{
"SENTRY_AUTH_TOKEN": fieldname.Token,
"SENTRY_ORG": fieldname.Organization,
"SENTRY_PROJECT": fieldname.Project,
"SENTRY_URL": fieldname.URL,
}

func TrySentryclircFile() sdk.Importer {
Expand All @@ -65,6 +77,14 @@ func TrySentryclircFile() sdk.Importer {
if section.HasKey("org") && section.Key("org").Value() != "" {
fields[fieldname.Organization] = section.Key("org").Value()
}

if section.HasKey("project") && section.Key("project").Value() != "" {
fields[fieldname.Project] = section.Key("project").Value()
}

if section.HasKey("url") && section.Key("url").Value() != "" {
fields[fieldname.URL] = section.Key("url").Value()
}
}

out.AddCandidate(sdk.ImportCandidate{
Expand Down
10 changes: 10 additions & 0 deletions plugins/sentry/auth_token_test.go
View file
Open in desktop
Expand Up @@ -14,12 +14,16 @@ func TestAuthTokenImporter(t *testing.T) {
Environment: map[string]string{
"SENTRY_AUTH_TOKEN": "hmcxn4gjv9etm096p4v9ttxkvhj4tdm6ft6qmaj4szbb62bwu6mrl0gopexample",
"SENTRY_ORG": "acme",
"SENTRY_PROJECT": "my-project",
"SENTRY_URL": "https://sentry.acme.com/",
},
ExpectedCandidates: []sdk.ImportCandidate{
{
Fields: map[sdk.FieldName]string{
fieldname.Token: "hmcxn4gjv9etm096p4v9ttxkvhj4tdm6ft6qmaj4szbb62bwu6mrl0gopexample",
fieldname.Organization: "acme",
fieldname.Project: "my-project",
fieldname.URL: "https://sentry.acme.com/",
},
},
},
Expand All @@ -33,6 +37,8 @@ func TestAuthTokenImporter(t *testing.T) {
Fields: map[sdk.FieldName]string{
fieldname.Token: "mw4ms9tx4dci52bfr19sbj40lb0pu9w4camnf8w3hfzl8hckvkdocd28nexample",
fieldname.Organization: "acme",
fieldname.Project: "my-project",
fieldname.URL: "https://sentry.acme.com/",
},
},
},
Expand All @@ -46,11 +52,15 @@ func TestAuthTokenProvisioner(t *testing.T) {
ItemFields: map[sdk.FieldName]string{
fieldname.Token: "hmcxn4gjv9etm096p4v9ttxkvhj4tdm6ft6qmaj4szbb62bwu6mrl0gopexample",
fieldname.Organization: "acme",
fieldname.Project: "my-project",
fieldname.URL: "https://sentry.acme.com/",
},
ExpectedOutput: sdk.ProvisionOutput{
Environment: map[string]string{
"SENTRY_AUTH_TOKEN": "hmcxn4gjv9etm096p4v9ttxkvhj4tdm6ft6qmaj4szbb62bwu6mrl0gopexample",
"SENTRY_ORG": "acme",
"SENTRY_PROJECT": "my-project",
"SENTRY_URL": "https://sentry.acme.com/",
},
},
},
Expand Down
2 changes: 2 additions & 0 deletions sdk/schema/fieldname/names.go
View file
Open in desktop
Expand Up @@ -44,6 +44,7 @@ const (
PublicKey = sdk.FieldName("Public Key")
PrivateKey = sdk.FieldName("Private Key")
ProjectID = sdk.FieldName("Project ID")
Project = sdk.FieldName("Project")
Region = sdk.FieldName("Region")
Secret = sdk.FieldName("Secret")
SecretAccessKey = sdk.FieldName("Secret Access Key")
Expand Down Expand Up @@ -96,6 +97,7 @@ func ListAll() []sdk.FieldName {
PublicKey,
PrivateKey,
ProjectID,
Project,
Region,
Secret,
SecretAccessKey,
Expand Down