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 resource: aws_ivs_playback_key_pair #27678

Merged
merged 10 commits into from
Nov 8, 2022
Merged
Show file tree
Hide file tree
Changes from 4 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
3 changes: 3 additions & 0 deletions .changelog/27678.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
aws_ivs_playback_key_pair
```
14 changes: 14 additions & 0 deletions .ci/.semgrep-service-name0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3099,3 +3099,17 @@ rules:
patterns:
- pattern-regex: "(?i)ConfigService"
severity: WARNING
- id: configservice-in-var-name
languages:
- go
message: Do not use "ConfigService" in var name inside configservice package
paths:
include:
- internal/service/configservice
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ConfigService"
severity: WARNING
42 changes: 28 additions & 14 deletions .ci/.semgrep-service-name1.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
# Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
rules:
- id: configservice-in-var-name
languages:
- go
message: Do not use "ConfigService" in var name inside configservice package
paths:
include:
- internal/service/configservice
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ConfigService"
severity: WARNING
- id: connect-in-func-name
languages:
- go
Expand Down Expand Up @@ -3090,3 +3076,31 @@ rules:
- pattern-not-regex: "^TestAccImageBuilder"
- pattern-regex: ^TestAcc.*
severity: WARNING
- id: imagebuilder-in-const-name
languages:
- go
message: Do not use "ImageBuilder" in const name inside imagebuilder package
paths:
include:
- internal/service/imagebuilder
patterns:
- pattern: const $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ImageBuilder"
severity: WARNING
- id: imagebuilder-in-var-name
languages:
- go
message: Do not use "ImageBuilder" in var name inside imagebuilder package
paths:
include:
- internal/service/imagebuilder
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ImageBuilder"
severity: WARNING
100 changes: 58 additions & 42 deletions .ci/.semgrep-service-name2.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,5 @@
# Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
rules:
- id: imagebuilder-in-const-name
languages:
- go
message: Do not use "ImageBuilder" in const name inside imagebuilder package
paths:
include:
- internal/service/imagebuilder
patterns:
- pattern: const $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ImageBuilder"
severity: WARNING
- id: imagebuilder-in-var-name
languages:
- go
message: Do not use "ImageBuilder" in var name inside imagebuilder package
paths:
include:
- internal/service/imagebuilder
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ImageBuilder"
severity: WARNING
- id: inspector-in-func-name
languages:
- go
Expand Down Expand Up @@ -376,6 +348,64 @@ rules:
- pattern-not-regex: "^TestAccIPAM"
- pattern-regex: ^TestAcc.*
severity: WARNING
- id: ivs-in-func-name
languages:
- go
message: Do not use "IVS" in func name inside ivs package
paths:
include:
- internal/service/ivs
patterns:
- pattern: func $NAME( ... ) { ... }
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)IVS"
- pattern-not-regex: ^TestAcc.*
severity: WARNING
- id: ivs-in-test-name
languages:
- go
message: Include "IVS" in test name
paths:
include:
- internal/service/ivs/*_test.go
patterns:
- pattern: func $NAME( ... ) { ... }
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-not-regex: "^TestAccIVS"
- pattern-regex: ^TestAcc.*
severity: WARNING
- id: ivs-in-const-name
languages:
- go
message: Do not use "IVS" in const name inside ivs package
paths:
include:
- internal/service/ivs
patterns:
- pattern: const $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)IVS"
severity: WARNING
- id: ivs-in-var-name
languages:
- go
message: Do not use "IVS" in var name inside ivs package
paths:
include:
- internal/service/ivs
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)IVS"
severity: WARNING
- id: kafka-in-func-name
languages:
- go
Expand Down Expand Up @@ -3069,17 +3099,3 @@ rules:
patterns:
- pattern-regex: "(?i)RDS"
severity: WARNING
- id: rds-in-var-name
languages:
- go
message: Do not use "RDS" in var name inside rds package
paths:
include:
- internal/service/rds
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)RDS"
severity: WARNING
14 changes: 14 additions & 0 deletions .ci/.semgrep-service-name3.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
rules:
- id: rds-in-var-name
languages:
- go
message: Do not use "RDS" in var name inside rds package
paths:
include:
- internal/service/rds
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)RDS"
severity: WARNING
- id: redshift-in-func-name
languages:
- go
Expand Down
1 change: 1 addition & 0 deletions .teamcity/components/generated/services_all.kt
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ val services = mapOf(
"iot" to ServiceSpec("IoT Core"),
"iotanalytics" to ServiceSpec("IoT Analytics"),
"iotevents" to ServiceSpec("IoT Events"),
"ivs" to ServiceSpec("IVS (Interactive Video)"),
"kafka" to ServiceSpec("Managed Streaming for Kafka", vpcLock = true),
"kafkaconnect" to ServiceSpec("Managed Streaming for Kafka Connect"),
"keyspaces" to ServiceSpec("Keyspaces (for Apache Cassandra)"),
Expand Down
3 changes: 3 additions & 0 deletions internal/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/service/inspector"
"github.com/hashicorp/terraform-provider-aws/internal/service/inspector2"
"github.com/hashicorp/terraform-provider-aws/internal/service/iot"
"github.com/hashicorp/terraform-provider-aws/internal/service/ivs"
"github.com/hashicorp/terraform-provider-aws/internal/service/kafka"
"github.com/hashicorp/terraform-provider-aws/internal/service/kafkaconnect"
"github.com/hashicorp/terraform-provider-aws/internal/service/kendra"
Expand Down Expand Up @@ -1650,6 +1651,8 @@ func New(_ context.Context) (*schema.Provider, error) {
"aws_iot_topic_rule": iot.ResourceTopicRule(),
"aws_iot_topic_rule_destination": iot.ResourceTopicRuleDestination(),

"aws_ivs_playback_key_pair": ivs.ResourcePlaybackKeyPair(),

"aws_msk_cluster": kafka.ResourceCluster(),
"aws_msk_configuration": kafka.ResourceConfiguration(),
"aws_msk_scram_secret_association": kafka.ResourceScramSecretAssociation(),
Expand Down
34 changes: 34 additions & 0 deletions internal/service/ivs/find.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package ivs

import (
"context"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ivs"
"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
)

func FindPlaybackKeyPairByID(ctx context.Context, conn *ivs.IVS, id string) (*ivs.PlaybackKeyPair, error) {
in := &ivs.GetPlaybackKeyPairInput{
Arn: aws.String(id),
}
out, err := conn.GetPlaybackKeyPairWithContext(ctx, in)
if tfawserr.ErrCodeEquals(err, ivs.ErrCodeResourceNotFoundException) {
return nil, &resource.NotFoundError{
LastError: err,
LastRequest: in,
}
}

if err != nil {
return nil, err
}

if out == nil || out.KeyPair == nil {
return nil, tfresource.NewEmptyResultError(in)
}

return out.KeyPair, nil
}
4 changes: 4 additions & 0 deletions internal/service/ivs/generate.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
//go:generate go run ../../generate/tags/main.go -ListTags -ServiceTagsMap -UpdateTags
// ONLY generate directives and package declaration! Do not add anything else to this file.

package ivs
Loading