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

New Service Clients: identitystore and ssoadmin #15119

Merged
merged 1 commit into from
Sep 15, 2020
Merged
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
16 changes: 16 additions & 0 deletions .hashibot.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
"service/iam" = [
"aws_iam_",
],
"service/identitystore" = [
"aws_identitystore_",
],
"service/imagebuilder" = [
"aws_imagebuilder_",
],
Expand Down Expand Up @@ -532,6 +535,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
"service/ssm" = [
"aws_ssm_",
],
"service/ssoadmin" = [
"aws_ssoadmin_",
],
"service/storagegateway" = [
"aws_storagegateway_",
],
Expand Down Expand Up @@ -1077,6 +1083,11 @@ behavior "pull_request_path_labeler" "service_labels" {
"**/*_iam_*",
"**/iam_*"
]
"service/identitystore" = [
"aws/internal/service/identitystore/**/*",
"**/*_identitystore_*",
"**/identitystore_*"
]
"service/imagebuilder" = [
"aws/internal/service/imagebuilder/**/*",
"**/*_imagebuilder_*",
Expand Down Expand Up @@ -1391,6 +1402,11 @@ behavior "pull_request_path_labeler" "service_labels" {
"**/*_ssm_*",
"**/ssm_*"
]
"service/ssoadmin" = [
"aws/internal/service/ssoadmin/**/*",
"**/*_ssoadmin_*",
"**/ssoadmin_*"
]
"service/storagegateway" = [
"aws/internal/service/storagegateway/**/*",
"**/*_storagegateway_*",
Expand Down
6 changes: 6 additions & 0 deletions aws/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ import (
"github.com/aws/aws-sdk-go/service/greengrass"
"github.com/aws/aws-sdk-go/service/guardduty"
"github.com/aws/aws-sdk-go/service/iam"
"github.com/aws/aws-sdk-go/service/identitystore"
"github.com/aws/aws-sdk-go/service/imagebuilder"
"github.com/aws/aws-sdk-go/service/inspector"
"github.com/aws/aws-sdk-go/service/iot"
Expand Down Expand Up @@ -139,6 +140,7 @@ import (
"github.com/aws/aws-sdk-go/service/sns"
"github.com/aws/aws-sdk-go/service/sqs"
"github.com/aws/aws-sdk-go/service/ssm"
"github.com/aws/aws-sdk-go/service/ssoadmin"
"github.com/aws/aws-sdk-go/service/storagegateway"
"github.com/aws/aws-sdk-go/service/sts"
"github.com/aws/aws-sdk-go/service/swf"
Expand Down Expand Up @@ -264,6 +266,7 @@ type AWSClient struct {
guarddutyconn *guardduty.GuardDuty
greengrassconn *greengrass.Greengrass
iamconn *iam.IAM
identitystoreconn *identitystore.IdentityStore
IgnoreTagsConfig *keyvaluetags.IgnoreConfig
imagebuilderconn *imagebuilder.Imagebuilder
inspectorconn *inspector.Inspector
Expand Down Expand Up @@ -329,6 +332,7 @@ type AWSClient struct {
snsconn *sns.SNS
sqsconn *sqs.SQS
ssmconn *ssm.SSM
ssoadminconn *ssoadmin.SSOAdmin
storagegatewayconn *storagegateway.StorageGateway
stsconn *sts.STS
supportedplatforms []string
Expand Down Expand Up @@ -492,6 +496,7 @@ func (c *Config) Client() (interface{}, error) {
guarddutyconn: guardduty.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["guardduty"])})),
greengrassconn: greengrass.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["greengrass"])})),
iamconn: iam.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["iam"])})),
identitystoreconn: identitystore.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["identitystore"])})),
IgnoreTagsConfig: c.IgnoreTagsConfig,
imagebuilderconn: imagebuilder.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["imagebuilder"])})),
inspectorconn: inspector.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["inspector"])})),
Expand Down Expand Up @@ -552,6 +557,7 @@ func (c *Config) Client() (interface{}, error) {
snsconn: sns.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["sns"])})),
sqsconn: sqs.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["sqs"])})),
ssmconn: ssm.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["ssm"])})),
ssoadminconn: ssoadmin.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["ssoadmin"])})),
storagegatewayconn: storagegateway.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["storagegateway"])})),
stsconn: sts.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["sts"])})),
swfconn: swf.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["swf"])})),
Expand Down
2 changes: 2 additions & 0 deletions aws/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,7 @@ func init() {
"greengrass",
"guardduty",
"iam",
"identitystore",
"imagebuilder",
"inspector",
"iot",
Expand Down Expand Up @@ -1166,6 +1167,7 @@ func init() {
"sns",
"sqs",
"ssm",
"ssoadmin",
"stepfunctions",
"storagegateway",
"sts",
Expand Down
2 changes: 2 additions & 0 deletions infrastructure/repository/labels-service.tf
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ variable "service_labels" {
"guardduty",
"honeycode",
"iam",
"identitystore",
"imagebuilder",
"inspector",
"iot",
Expand Down Expand Up @@ -175,6 +176,7 @@ variable "service_labels" {
"sns",
"sqs",
"ssm",
"ssoadmin",
"storagegateway",
"sts",
"support",
Expand Down
Loading