From 54eeec3c357590820dbe2d148d6608a01cb02bea Mon Sep 17 00:00:00 2001 From: Tom Bamford Date: Fri, 21 Apr 2023 10:27:19 +0100 Subject: [PATCH 1/2] Tooling: re-enable tfproviderlint --- .github/workflows/tflint.yaml | 1 - .../application_federated_identity_credential_resource.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tflint.yaml b/.github/workflows/tflint.yaml index c4eca6adc8..838ea7998b 100644 --- a/.github/workflows/tflint.yaml +++ b/.github/workflows/tflint.yaml @@ -19,7 +19,6 @@ concurrency: jobs: tflint: runs-on: ubuntu-latest - if: false # skip until https://github.com/bflad/tfproviderlint/issues/255 is fixed steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 diff --git a/internal/services/applications/application_federated_identity_credential_resource.go b/internal/services/applications/application_federated_identity_credential_resource.go index 3bcc9b8ec2..5e1f68de22 100644 --- a/internal/services/applications/application_federated_identity_credential_resource.go +++ b/internal/services/applications/application_federated_identity_credential_resource.go @@ -54,11 +54,11 @@ func applicationFederatedIdentityCredentialResource() *schema.Resource { Description: "List of audiences that can appear in the external token. This specifies what should be accepted in the `aud` claim of incoming tokens.", Type: schema.TypeList, Required: true, + MinItems: 1, + MaxItems: 1, // TODO: consider making this a scalar value instead of a list in v3.0 (the API now only accepts a single value) Elem: &schema.Schema{ Type: schema.TypeString, - MinItems: 1, - MaxItems: 1, ValidateDiagFunc: validate.ValidateDiag(validation.StringIsNotEmpty), }, }, From 579b37a123d1badbc9cd8a89d28ac46a9247b05a Mon Sep 17 00:00:00 2001 From: Tom Bamford Date: Tue, 25 Apr 2023 12:40:08 +0100 Subject: [PATCH 2/2] Remove redundant `MinItems` Co-authored-by: Tom Harvey --- .../application_federated_identity_credential_resource.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/services/applications/application_federated_identity_credential_resource.go b/internal/services/applications/application_federated_identity_credential_resource.go index 5e1f68de22..5c38d70bfc 100644 --- a/internal/services/applications/application_federated_identity_credential_resource.go +++ b/internal/services/applications/application_federated_identity_credential_resource.go @@ -54,7 +54,6 @@ func applicationFederatedIdentityCredentialResource() *schema.Resource { Description: "List of audiences that can appear in the external token. This specifies what should be accepted in the `aud` claim of incoming tokens.", Type: schema.TypeList, Required: true, - MinItems: 1, MaxItems: 1, // TODO: consider making this a scalar value instead of a list in v3.0 (the API now only accepts a single value) Elem: &schema.Schema{