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

[WIP] F amazon bedrock #33816

Closed
wants to merge 50 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
8e799b8
add Amazon Bedrock to names
skyscrapr Sep 29, 2023
dc6b072
update go sdk version
skyscrapr Sep 29, 2023
fba2c71
Add Models Data Sources
skyscrapr Sep 29, 2023
248cd35
add bedrock_foundation_model datasource
skyscrapr Sep 29, 2023
eea2938
add custom_model resource
skyscrapr Oct 1, 2023
0425845
complete fine tuning job create
skyscrapr Oct 2, 2023
6ba44be
fix wait for model fine tuning
skyscrapr Oct 3, 2023
fcd76d1
extend create default timeout to 2 hours
skyscrapr Oct 4, 2023
14d2de8
Add service name to test names
skyscrapr Oct 4, 2023
e87aa87
add Amazon Bedrock to names
skyscrapr Sep 29, 2023
eeb9a79
update go sdk version
skyscrapr Sep 29, 2023
ddd6313
Add Models Data Sources
skyscrapr Sep 29, 2023
cedf246
add bedrock_foundation_model datasource
skyscrapr Sep 29, 2023
6af81aa
add custom_model resource
skyscrapr Oct 1, 2023
44ee9a5
complete fine tuning job create
skyscrapr Oct 2, 2023
0fb84fa
fix wait for model fine tuning
skyscrapr Oct 3, 2023
e43279f
extend create default timeout to 2 hours
skyscrapr Oct 4, 2023
f4b58e6
Add service name to test names
skyscrapr Oct 4, 2023
a8092c9
test lint fixes
skyscrapr Oct 5, 2023
8168d98
dependency fixes
skyscrapr Oct 5, 2023
4c4dc2f
Merge branch 'f-amazon-bedrock' of https://github.com/skyscrapr/terra…
skyscrapr Oct 5, 2023
a3d5efc
add training and validation metrics to custom model schema
skyscrapr Oct 5, 2023
2057fbb
complete test scenario
skyscrapr Oct 6, 2023
789af8d
udpdate docs
skyscrapr Oct 6, 2023
0711953
add tags support and tidy up code
skyscrapr Oct 7, 2023
8e37da4
add tag support to code gen
skyscrapr Oct 7, 2023
7be3a7a
add model_invocation_logging_configuration resource
skyscrapr Oct 7, 2023
b8ba20d
tidy up docs
skyscrapr Oct 7, 2023
571875f
removal of timeouts for model_invocation_logging_configuration
skyscrapr Oct 7, 2023
be0b3b5
add loggin config docs
skyscrapr Oct 7, 2023
e8fe7b7
add copyright header
skyscrapr Oct 7, 2023
22817d8
minor fixes for tests
skyscrapr Oct 7, 2023
9de066c
add missing attribute
skyscrapr Oct 8, 2023
5d6fed2
fixup tag support
skyscrapr Oct 8, 2023
a987ac9
minor fixes to tidy up cancel and destroy
skyscrapr Oct 8, 2023
27cdf08
better handle tainted resource
skyscrapr Oct 8, 2023
f64100c
add missing attributes in custom model
skyscrapr Oct 9, 2023
6f0f14c
terrafmt fixes
skyscrapr Oct 9, 2023
3f8bb28
website lint fixes
skyscrapr Oct 9, 2023
18dd8a1
provider lint fixes
skyscrapr Oct 9, 2023
1e22cff
semgrep fixes
skyscrapr Oct 9, 2023
fd92cdf
fix golang lint issues
skyscrapr Oct 9, 2023
32fbbe1
fix conflict
skyscrapr Oct 9, 2023
9bb9e8b
fix conflict
skyscrapr Oct 9, 2023
2ffec7c
fix website docs linting
skyscrapr Oct 9, 2023
18232ba
fix semgrep linting
skyscrapr Oct 9, 2023
25664c9
fix website links
skyscrapr Oct 9, 2023
bcd1969
more linting fixes
skyscrapr Oct 10, 2023
abee6af
website linting fixes
skyscrapr Oct 10, 2023
5d0d45f
more fixes
skyscrapr Oct 10, 2023
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.

2 changes: 2 additions & 0 deletions internal/provider/service_packages_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)
Loading
Loading