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

Amazon Bedrock: Service client #33851

Merged
merged 3 commits into from
Oct 9, 2023
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
101 changes: 58 additions & 43 deletions .ci/.semgrep-service-name0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1506,6 +1506,64 @@ rules:
patterns:
- pattern-regex: "(?i)beanstalk"
severity: WARNING
- id: bedrock-in-func-name
languages:
- go
message: Do not use "Bedrock" in func name inside bedrock package
paths:
include:
- internal/service/bedrock
patterns:
- pattern: func $NAME( ... ) { ... }
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)Bedrock"
- pattern-not-regex: ^TestAcc.*
severity: WARNING
- id: bedrock-in-test-name
languages:
- go
message: Include "Bedrock" in test name
paths:
include:
- internal/service/bedrock/*_test.go
patterns:
- pattern: func $NAME( ... ) { ... }
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-not-regex: "^TestAccBedrock"
- pattern-regex: ^TestAcc.*
severity: WARNING
- id: bedrock-in-const-name
languages:
- go
message: Do not use "Bedrock" in const name inside bedrock package
paths:
include:
- internal/service/bedrock
patterns:
- pattern: const $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)Bedrock"
severity: WARNING
- id: bedrock-in-var-name
languages:
- go
message: Do not use "Bedrock" in var name inside bedrock package
paths:
include:
- internal/service/bedrock
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)Bedrock"
severity: WARNING
- id: budgets-in-func-name
languages:
- go
Expand Down Expand Up @@ -3420,46 +3478,3 @@ rules:
- pattern-not-regex: "^TestAccComputeOptimizer"
- pattern-regex: ^TestAcc.*
severity: WARNING
- id: computeoptimizer-in-const-name
languages:
- go
message: Do not use "ComputeOptimizer" in const name inside computeoptimizer package
paths:
include:
- internal/service/computeoptimizer
patterns:
- pattern: const $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ComputeOptimizer"
severity: WARNING
- id: computeoptimizer-in-var-name
languages:
- go
message: Do not use "ComputeOptimizer" in var name inside computeoptimizer package
paths:
include:
- internal/service/computeoptimizer
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ComputeOptimizer"
severity: WARNING
- id: configservice-in-func-name
languages:
- go
message: Do not use "ConfigService" in func name inside configservice package
paths:
include:
- internal/service/configservice
patterns:
- pattern: func $NAME( ... ) { ... }
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ConfigService"
- pattern-not-regex: ^TestAcc.*
severity: WARNING
72 changes: 43 additions & 29 deletions .ci/.semgrep-service-name1.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,48 @@
# Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
rules:
- id: computeoptimizer-in-const-name
languages:
- go
message: Do not use "ComputeOptimizer" in const name inside computeoptimizer package
paths:
include:
- internal/service/computeoptimizer
patterns:
- pattern: const $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ComputeOptimizer"
severity: WARNING
- id: computeoptimizer-in-var-name
languages:
- go
message: Do not use "ComputeOptimizer" in var name inside computeoptimizer package
paths:
include:
- internal/service/computeoptimizer
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ComputeOptimizer"
severity: WARNING
- id: configservice-in-func-name
languages:
- go
message: Do not use "ConfigService" in func name inside configservice package
paths:
include:
- internal/service/configservice
patterns:
- pattern: func $NAME( ... ) { ... }
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)ConfigService"
- pattern-not-regex: ^TestAcc.*
severity: WARNING
- id: configservice-in-test-name
languages:
- go
Expand Down Expand Up @@ -3437,32 +3480,3 @@ rules:
patterns:
- pattern-regex: "(?i)Inspector2"
severity: WARNING
- id: inspectorv2-in-func-name
languages:
- go
message: Do not use "inspectorv2" in func name inside inspector2 package
paths:
include:
- internal/service/inspector2
patterns:
- pattern: func $NAME( ... ) { ... }
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)inspectorv2"
- pattern-not-regex: ^TestAcc.*
severity: WARNING
- id: inspectorv2-in-const-name
languages:
- go
message: Do not use "inspectorv2" in const name inside inspector2 package
paths:
include:
- internal/service/inspector2
patterns:
- pattern: const $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)inspectorv2"
severity: WARNING
43 changes: 29 additions & 14 deletions .ci/.semgrep-service-name2.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
# Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
rules:
- id: inspectorv2-in-func-name
languages:
- go
message: Do not use "inspectorv2" in func name inside inspector2 package
paths:
include:
- internal/service/inspector2
patterns:
- pattern: func $NAME( ... ) { ... }
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)inspectorv2"
- pattern-not-regex: ^TestAcc.*
severity: WARNING
- id: inspectorv2-in-const-name
languages:
- go
message: Do not use "inspectorv2" in const name inside inspector2 package
paths:
include:
- internal/service/inspector2
patterns:
- pattern: const $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)inspectorv2"
severity: WARNING
- id: inspectorv2-in-var-name
languages:
- go
Expand Down Expand Up @@ -3450,17 +3479,3 @@ rules:
patterns:
- pattern-regex: "(?i)Redshift"
severity: WARNING
- id: redshift-in-var-name
languages:
- go
message: Do not use "Redshift" in var name inside redshift package
paths:
include:
- internal/service/redshift
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)Redshift"
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: redshift-in-var-name
languages:
- go
message: Do not use "Redshift" in var name inside redshift package
paths:
include:
- internal/service/redshift
patterns:
- pattern: var $NAME = ...
- metavariable-pattern:
metavariable: $NAME
patterns:
- pattern-regex: "(?i)Redshift"
severity: WARNING
- id: redshiftdata-in-func-name
languages:
- go
Expand Down
2 changes: 2 additions & 0 deletions .github/labeler-issue-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ service/backupgateway:
- '((\*|-)\s*`?|(data|resource)\s+"?)aws_backupgateway_'
service/batch:
- '((\*|-)\s*`?|(data|resource)\s+"?)aws_batch_'
service/bedrock:
- '((\*|-)\s*`?|(data|resource)\s+"?)aws_bedrock_'
service/billingconductor:
- '((\*|-)\s*`?|(data|resource)\s+"?)aws_billingconductor_'
service/braket:
Expand Down
3 changes: 3 additions & 0 deletions .github/labeler-pr-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ service/backupgateway:
service/batch:
- 'internal/service/batch/**/*'
- 'website/**/batch_*'
service/bedrock:
- 'internal/service/bedrock/**/*'
- 'website/**/bedrock_*'
service/billingconductor:
- 'internal/service/billingconductor/**/*'
- 'website/**/billingconductor_*'
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 @@ -24,6 +24,7 @@ val services = mapOf(
"autoscalingplans" to ServiceSpec("Auto Scaling Plans"),
"backup" to ServiceSpec("Backup"),
"batch" to ServiceSpec("Batch", vpcLock = true),
"bedrock" to ServiceSpec("Amazon Bedrock"),
"budgets" to ServiceSpec("Web Services Budgets"),
"ce" to ServiceSpec("CE (Cost Explorer)"),
"chime" to ServiceSpec("Chime"),
Expand Down
1 change: 1 addition & 0 deletions infrastructure/repository/labels-service.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ variable "service_labels" {
"backup",
"backupgateway",
"batch",
"bedrock",
"billingconductor",
"braket",
"budgets",
Expand Down
5 changes: 5 additions & 0 deletions internal/conns/awsclient_gen.go

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

5 changes: 5 additions & 0 deletions internal/service/bedrock/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Terraform AWS Provider Amazon Bedrock Package

* AWS Provider: [Contribution Guide](https://hashicorp.github.io/terraform-provider-aws/#contribute)
* Service User Guide: [What is Amazon Bedrock?](https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-service.html)
* Service API Guide: [Bedrock API Reference](https://docs.aws.amazon.com/bedrock/latest/APIReference/welcome.html)
1 change: 1 addition & 0 deletions names/consts_gen.go

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

1 change: 1 addition & 0 deletions names/names_data.csv
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ autoscaling-plans,autoscalingplans,autoscalingplans,autoscalingplans,,autoscalin
backup,backup,backup,backup,,backup,,,Backup,Backup,,1,,,aws_backup_,,backup_,Backup,AWS,,,,,,
backup-gateway,backupgateway,backupgateway,backupgateway,,backupgateway,,,BackupGateway,BackupGateway,,1,,,aws_backupgateway_,,backupgateway_,Backup Gateway,AWS,,x,,,,
batch,batch,batch,batch,,batch,,,Batch,Batch,,1,,,aws_batch_,,batch_,Batch,AWS,,,,,,
bedrock,bedrock,bedrock,,,bedrock,,,Bedrock,Bedrock,,1,,,aws_bedrock_,,bedrock_,Amazon Bedrock,Amazon,,,,,,
billingconductor,billingconductor,billingconductor,,,billingconductor,,,BillingConductor,BillingConductor,,1,,,aws_billingconductor_,,billingconductor_,Billing Conductor,AWS,,x,,,,
braket,braket,braket,braket,,braket,,,Braket,Braket,,1,,,aws_braket_,,braket_,Braket,Amazon,,x,,,,
ce,ce,costexplorer,costexplorer,,ce,,costexplorer,CE,CostExplorer,,1,,,aws_ce_,,ce_,CE (Cost Explorer),AWS,,,,,,
Expand Down
1 change: 1 addition & 0 deletions website/allowed-subcategories.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ AMP (Managed Prometheus)
API Gateway
API Gateway V2
Account Management
Amazon Bedrock
Amplify
App Mesh
App Runner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ provider "aws" {
<li><code>autoscalingplans</code></li>
<li><code>backup</code></li>
<li><code>batch</code></li>
<li><code>bedrock</code></li>
<li><code>budgets</code></li>
<li><code>ce</code> (or <code>costexplorer</code>)</li>
<li><code>chime</code></li>
Expand Down
Loading