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

Fix ses smtp accesskey #718

Closed
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
5 changes: 5 additions & 0 deletions apis/iam/v1beta1/zz_accesskey_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions apis/iam/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions config/overrides.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ import (

// RegionAddition adds region to the spec of all resources except iam group which
// does not have a region notion.
func RegionAddition() config.ResourceOption {
func RegionAddition() config.ResourceOption { //nolint:gocyclo // Only slightly over complexity, 11 instead of 10.
return func(r *config.Resource) {
turkenh marked this conversation as resolved.
Show resolved Hide resolved
if r.ShortGroup == "iam" || r.ShortGroup == "opsworks" {
return
// aws_iam_access_key is an exception in the iam group that it requires setting region under some circumstances. Please see https://github.com/upbound/provider-aws/issues/717
if r.Name != "aws_iam_access_key" {
return
}
}
c := "Region is the region you'd like your resource to be created in.\n"
comment, err := comments.New(c, comments.WithTFTag("-"))
Expand Down
1 change: 1 addition & 0 deletions examples-generated/iam/accesskey.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ metadata:
spec:
forProvider:
pgpKey: keybase:some_person_that_exists
region: us-west-1
userSelector:
matchLabels:
testing.upbound.io/example-name: lb
Expand Down
6 changes: 6 additions & 0 deletions package/crds/iam.aws.upbound.io_accesskeys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ spec:
and not the "armored" one (e.g. avoid passing the -a option
to gpg --export).
type: string
region:
description: Region is the region you'd like your resource to
be created in.
type: string
status:
description: Access key status to apply. Defaults to Active. Valid
values are Active and Inactive.
Expand Down Expand Up @@ -157,6 +161,8 @@ spec:
type: string
type: object
type: object
required:
- region
type: object
managementPolicy:
default: FullControl
Expand Down