F aws bedrock custom model

[skyscrapr]

Description

add aws_bedrock_custom_model resource and datasources

Relations

Relates #34148
Closes #33718

References

https://docs.aws.amazon.com/bedrock/latest/APIReference/API_CreateModelCustomizationJob.html
https://docs.aws.amazon.com/bedrock/latest/APIReference/API_GetCustomModel.html
https://docs.aws.amazon.com/bedrock/latest/APIReference/API_DeleteCustomModel.html

Output from Acceptance Testing

% make testacc TESTS=TestAccBedrockCustomModel_ PKG=bedrock

TBD...

[github-actions]

Community Note

Voting for Prioritization

• Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
• Please see our prioritization guide for information on how we prioritize.
• Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

• Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
• For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
• Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

[skyscrapr]

@wellsiau-aws @AdamTylerLynch Can you get this tested please? I no longer have an account with access to the Titan Express preview model required to test fine-tuning.

[silvaalbert]

@wellsiau-aws @AdamTylerLynch Can you get this tested please? I no longer have an account with access to the Titan Express preview model required to test fine-tuning.

I'll run these today

[silvaalbert]

@skyscrapr - I was able to run tests but am getting failures. See below. Happy to collaborate on fixes if you like.

TF_ACC=1 go test ./internal/service/bedrock/... -v -count 1 -parallel 5 -run='TestAccBedrockCustomModelDataSource'  -timeout 360m
=== RUN   TestAccBedrockCustomModelDataSource_basic
=== PAUSE TestAccBedrockCustomModelDataSource_basic
=== CONT  TestAccBedrockCustomModelDataSource_basic
    custom_model_data_source_test.go:21: Step 1/1 error: Error running apply: exit status 1

        Error: Provider returned invalid result object after apply

        After the apply operation, the provider still indicated an unknown value for
        aws_bedrock_custom_model.test.base_model_arn. All values must be known after
        apply, so this is always a bug in the provider and should be reported in the
        provider's own repository. Terraform will still save the other known object
        values in the state.

        Error: Provider returned invalid result object after apply

        After the apply operation, the provider still indicated an unknown value for
        aws_bedrock_custom_model.test.creation_time. All values must be known after
        apply, so this is always a bug in the provider and should be reported in the
        provider's own repository. Terraform will still save the other known object
        values in the state.

        Error: Provider returned invalid result object after apply

        After the apply operation, the provider still indicated an unknown value for
        aws_bedrock_custom_model.test.model_arn. All values must be known after
        apply, so this is always a bug in the provider and should be reported in the
        provider's own repository. Terraform will still save the other known object
        values in the state.

        Error: Provider returned invalid result object after apply

        After the apply operation, the provider still indicated an unknown value for
        aws_bedrock_custom_model.test.model_kms_key_arn. All values must be known
        after apply, so this is always a bug in the provider and should be reported
        in the provider's own repository. Terraform will still save the other known
        object values in the state.

        Error: Provider returned invalid result object after apply

        After the apply operation, the provider still indicated an unknown value for
        aws_bedrock_custom_model.test.model_name. All values must be known after
        apply, so this is always a bug in the provider and should be reported in the
        provider's own repository. Terraform will still save the other known object
        values in the state.

        Error: Provider returned invalid result object after apply

        After the apply operation, the provider still indicated an unknown value for
        aws_bedrock_custom_model.test.tags_all. All values must be known after apply,
        so this is always a bug in the provider and should be reported in the
        provider's own repository. Terraform will still save the other known object
        values in the state.

        Error: Value Conversion Error

          with aws_bedrock_custom_model.test,
          on terraform_plugin_test.tf line 123, in resource "aws_bedrock_custom_model" "test":
         123: resource "aws_bedrock_custom_model" "test" {

        An unexpected error was encountered trying to convert from value. This is
        always an error in the provider. Please report the following to the provider
        developer:

        cannot use type bedrock.validationDataConfig as schema type
        basetypes.ListType; basetypes.ListType must be an attr.TypeWithAttributeTypes
        to hold bedrock.validationDataConfig
--- FAIL: TestAccBedrockCustomModelDataSource_basic (3873.56s)
FAIL
FAIL	github.com/hashicorp/terraform-provider-aws/internal/service/bedrock	3876.854s
FAIL
make: *** [testacc] Error 1

[skyscrapr]

@silvaalbert ... hi, thanks for the output. Let me take a look at this today and I'll confirm if we need to connect to resolve.

[AdamTylerLynch]

@skyscrapr can you please contact me directly? awstyler [@] amazon.com

[AdamTylerLynch]

Current outputs:

make testacc TESTS=TestAccBedrockCustomModel_ PKG=bedrock
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/bedrock/... -v -count 1 -parallel 20 -run='TestAccBedrockCustomModel_'  -timeout 360m
=== RUN   TestAccBedrockCustomModel_basic
=== PAUSE TestAccBedrockCustomModel_basic
=== CONT  TestAccBedrockCustomModel_basic
    custom_model_test.go:20: Step 1/2 error: Error running apply: exit status 1
        
        Error: Provider produced inconsistent result after apply
        
        When applying changes to aws_bedrock_custom_model.test, provider
        "provider[\"registry.terraform.io/hashicorp/aws\"]" produced an unexpected
        new value: .training_metrics: block count changed from 0 to 1.
        
        This is a bug in the provider, which should be reported in the provider's own
        issue tracker.
--- FAIL: TestAccBedrockCustomModel_basic (4369.05s)
FAIL
FAIL	github.com/hashicorp/terraform-provider-aws/internal/service/bedrock	4372.322s
FAIL
make: *** [testacc] Error 1

[ewbankkit]

After a design discussion with @AdamTylerLynch, we decided on this resource lifecycle:

This Terraform resource interacts with two Amazon Bedrock entities:

1. A Continued Pre-training or Fine-tuning job which is started when the Terraform resource is created. The customization job can take several hours to run to completion. The duration of the job depends on the size of the training data (number of records, input tokens, and output tokens), and hyperparameters (number of epochs, and batch size).
2. The custom model output on successful completion of the customization job.

This resource's behaviors correspond to operations on these Amazon Bedrock entities:

• Create starts the customization job and immediately returns.
• Read returns the status and results of the customization job. If the customization job has completed, the output model's properties are returned.
• Update updates the customization job's tags.
• Delete stops the customization job if it is still active. If the customization job has completed, the custom model output by the job is deleted.

[skyscrapr]

@ewbankkit @AdamTylerLynch Hey gents. Apologies for dropping this. The customer I was working with put this on hold end of last year. I've been away for all of January and AFK. I'm back on the ground from Monday. Thanks for picking this up. Let me know if there's more to do, and I can continue to work on this.

[ewbankkit]

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccBedrockCustomModel_validationDataConfigWaitForCompletion' PKG=bedrock
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/bedrock/... -v -count 1 -parallel 20  -run=TestAccBedrockCustomModel_validationDataConfigWaitForCompletion -timeout 360m
=== RUN   TestAccBedrockCustomModel_validationDataConfigWaitForCompletion
=== PAUSE TestAccBedrockCustomModel_validationDataConfigWaitForCompletion
=== CONT  TestAccBedrockCustomModel_validationDataConfigWaitForCompletion
--- PASS: TestAccBedrockCustomModel_validationDataConfigWaitForCompletion (4376.29s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrock	4389.235s

% make testacc TESTARGS='-run=TestAccBedrockFoundationModel' PKG=bedrock ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/bedrock/... -v -count 1 -parallel 2  -run=TestAccBedrockFoundationModel -timeout 360m
=== RUN   TestAccBedrockFoundationModelDataSource_basic
=== PAUSE TestAccBedrockFoundationModelDataSource_basic
=== RUN   TestAccBedrockFoundationModelsDataSource_basic
=== PAUSE TestAccBedrockFoundationModelsDataSource_basic
=== RUN   TestAccBedrockFoundationModelsDataSource_byCustomizationType
=== PAUSE TestAccBedrockFoundationModelsDataSource_byCustomizationType
=== RUN   TestAccBedrockFoundationModelsDataSource_byInferenceType
=== PAUSE TestAccBedrockFoundationModelsDataSource_byInferenceType
=== RUN   TestAccBedrockFoundationModelsDataSource_byOutputModality
=== PAUSE TestAccBedrockFoundationModelsDataSource_byOutputModality
=== CONT  TestAccBedrockFoundationModelDataSource_basic
=== CONT  TestAccBedrockFoundationModelsDataSource_byInferenceType
--- PASS: TestAccBedrockFoundationModelsDataSource_byInferenceType (14.20s)
=== CONT  TestAccBedrockFoundationModelsDataSource_byOutputModality
--- PASS: TestAccBedrockFoundationModelDataSource_basic (14.41s)
=== CONT  TestAccBedrockFoundationModelsDataSource_byCustomizationType
--- PASS: TestAccBedrockFoundationModelsDataSource_byCustomizationType (13.11s)
=== CONT  TestAccBedrockFoundationModelsDataSource_basic
--- PASS: TestAccBedrockFoundationModelsDataSource_byOutputModality (13.34s)
--- PASS: TestAccBedrockFoundationModelsDataSource_basic (11.82s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrock	50.205s

% make testacc-short TESTARGS='-run=TestAccBedrockCustomModel_' PKG=bedrock ACCTEST_PARALLELISM=1   
==> Checking that code complies with gofmt requirements...
Running acceptance tests with -short flag
TF_ACC=1 go test ./internal/service/bedrock/... -v -short -count 1 -parallel 1  -run=TestAccBedrockCustomModel_ -timeout 360m
=== RUN   TestAccBedrockCustomModel_basic
=== PAUSE TestAccBedrockCustomModel_basic
=== RUN   TestAccBedrockCustomModel_disappears
=== PAUSE TestAccBedrockCustomModel_disappears
=== RUN   TestAccBedrockCustomModel_tags
=== PAUSE TestAccBedrockCustomModel_tags
=== RUN   TestAccBedrockCustomModel_kmsKey
=== PAUSE TestAccBedrockCustomModel_kmsKey
=== RUN   TestAccBedrockCustomModel_validationDataConfig
=== PAUSE TestAccBedrockCustomModel_validationDataConfig
=== RUN   TestAccBedrockCustomModel_validationDataConfigWaitForCompletion
    custom_model_test.go:209: skipping long-running test in short mode
--- SKIP: TestAccBedrockCustomModel_validationDataConfigWaitForCompletion (0.00s)
=== RUN   TestAccBedrockCustomModel_vpcConfig
=== PAUSE TestAccBedrockCustomModel_vpcConfig
=== CONT  TestAccBedrockCustomModel_basic
--- PASS: TestAccBedrockCustomModel_basic (60.77s)
=== CONT  TestAccBedrockCustomModel_kmsKey
--- PASS: TestAccBedrockCustomModel_kmsKey (59.36s)
=== CONT  TestAccBedrockCustomModel_vpcConfig
--- PASS: TestAccBedrockCustomModel_vpcConfig (56.68s)
=== CONT  TestAccBedrockCustomModel_validationDataConfig
--- PASS: TestAccBedrockCustomModel_validationDataConfig (58.70s)
=== CONT  TestAccBedrockCustomModel_tags
--- PASS: TestAccBedrockCustomModel_tags (57.94s)
=== CONT  TestAccBedrockCustomModel_disappears
--- PASS: TestAccBedrockCustomModel_disappears (76.31s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrock	380.208s

% make testacc TESTARGS='-run=TestAccBedrockCustomModelDataSource_basic' PKG=bedrock
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/bedrock/... -v -count 1 -parallel 20  -run=TestAccBedrockCustomModelDataSource_basic -timeout 360m
=== RUN   TestAccBedrockCustomModelDataSource_basic
=== PAUSE TestAccBedrockCustomModelDataSource_basic
=== CONT  TestAccBedrockCustomModelDataSource_basic
--- PASS: TestAccBedrockCustomModelDataSource_basic (4298.45s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrock	4309.648s

% make testacc TESTARGS='-run=TestAccBedrockCustomModelsDataSource_basic' PKG=bedrock
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/bedrock/... -v -count 1 -parallel 20  -run=TestAccBedrockCustomModelsDataSource_basic -timeout 360m
=== RUN   TestAccBedrockCustomModelsDataSource_basic
=== PAUSE TestAccBedrockCustomModelsDataSource_basic
=== CONT  TestAccBedrockCustomModelsDataSource_basic
--- PASS: TestAccBedrockCustomModelsDataSource_basic (4046.60s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrock	4057.208s

[ewbankkit]

@skyscrapr @AdamTylerLynch Thanks for the contribution 🎉 👏.

[github-actions]

This functionality has been released in v5.35.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

[github-actions]

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.