Skip to content

Commit

Permalink
Merge pull request #5956 from marcoreni/feature/4990_pinpoint_app
Browse files Browse the repository at this point in the history
New resource: aws_pinpoint_app
  • Loading branch information
bflad authored Sep 28, 2018
2 parents ad77a6c + 4d39884 commit a75fc98
Show file tree
Hide file tree
Showing 7 changed files with 749 additions and 0 deletions.
3 changes: 3 additions & 0 deletions aws/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ import (
"github.com/aws/aws-sdk-go/service/neptune"
"github.com/aws/aws-sdk-go/service/opsworks"
"github.com/aws/aws-sdk-go/service/organizations"
"github.com/aws/aws-sdk-go/service/pinpoint"
"github.com/aws/aws-sdk-go/service/pricing"
"github.com/aws/aws-sdk-go/service/rds"
"github.com/aws/aws-sdk-go/service/redshift"
Expand Down Expand Up @@ -239,6 +240,7 @@ type AWSClient struct {
budgetconn *budgets.Budgets
neptuneconn *neptune.Neptune
pricingconn *pricing.Pricing
pinpointconn *pinpoint.Pinpoint
}

func (c *AWSClient) S3() *s3.S3 {
Expand Down Expand Up @@ -563,6 +565,7 @@ func (c *Config) Client() (interface{}, error) {
client.appsyncconn = appsync.New(sess)
client.neptuneconn = neptune.New(sess)
client.pricingconn = pricing.New(sess)
client.pinpointconn = pinpoint.New(sess)

// Workaround for https://github.com/aws/aws-sdk-go/issues/1376
client.kinesisconn.Handlers.Retry.PushBack(func(r *request.Request) {
Expand Down
1 change: 1 addition & 0 deletions aws/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ func Provider() terraform.ResourceProvider {
"aws_batch_compute_environment": resourceAwsBatchComputeEnvironment(),
"aws_batch_job_definition": resourceAwsBatchJobDefinition(),
"aws_batch_job_queue": resourceAwsBatchJobQueue(),
"aws_pinpoint_app": resourceAwsPinpointApp(),

// ALBs are actually LBs because they can be type `network` or `application`
// To avoid regressions, we will add a new resource for each and they both point
Expand Down
Loading

0 comments on commit a75fc98

Please sign in to comment.