Skip to content

Commit 5117c14

Browse files
oarbusioarbusi
authored
test: Enable Acceptance test in CI for mongodbatlas_federated_settings_identity_provider (#1895)
* initial commit * remove skip tests * fix indent * add variables * temporary removal of QA * secrets * fix test * fix test * use same org * fix * fix name * add qa: * PR comments * new line * change mongo to mongodb
1 parent cbeec93 commit 5117c14

5 files changed

+73
-14
lines changed

‎.github/workflows/acceptance-tests-runner.yml

+59-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,30 @@ on:
5858
aws_region_federation:
5959
type: string
6060
required: true
61+
mongodb_atlas_federation_settings_id:
62+
type: string
63+
required: true
64+
mongodb_atlas_federatied_okta_idp_id:
65+
type: string
66+
required: true
67+
mongodb_atlas_federatied_idp_id:
68+
type: string
69+
required: true
70+
mongodb_atlas_federatied_oidc_idp_id:
71+
type: string
72+
required: true
73+
mongodb_atlas_federatied_sso_url:
74+
type: string
75+
required: true
76+
mongodb_atlas_federatied_issuer_uri:
77+
type: string
78+
required: true
79+
mongodb_atlas_federatied_project_id:
80+
type: string
81+
required: true
82+
mongodb_atlas_federatied_org_id:
83+
type: string
84+
required: true
6185
secrets: # all secrets are passed explicitly in this workflow
6286
mongodb_atlas_public_key:
6387
required: true
@@ -108,6 +132,7 @@ jobs:
108132
assume_role: ${{ steps.filter.outputs.assume_role == 'true' || env.mustTrigger == 'true' }}
109133
event_trigger: ${{ steps.filter.outputs.event_trigger == 'true' || env.mustTrigger == 'true' }}
110134
search_index: ${{ steps.filter.outputs.search_index == 'true' || env.mustTrigger == 'true' }}
135+
federated_settings_identity_provider: ${{ steps.filter.outputs.federated_settings_identity_provider == 'true' || env.mustTrigger == 'true' }}
111136
steps:
112137
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
113138
- uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd
@@ -177,6 +202,8 @@ jobs:
177202
- 'internal/service/eventtrigger/*.go'
178203
search_index:
179204
- 'internal/service/searchindex/*.go'
205+
federated_settings_identity_provider:
206+
- 'internal/service/federatedsettingsidentityprovider/*.go'
180207
181208
cluster_outage_simulation:
182209
needs: [ change-detection ]
@@ -607,4 +634,35 @@ jobs:
607634
MONGODB_ATLAS_ORG_ID: ${{ inputs.mongodb_atlas_org_id }}
608635
TEST_REGEX: "^TestAccSearchIndex"
609636
run: make testacc
610-
637+
638+
federated_settings_identity_provider:
639+
needs: [ change-detection ]
640+
if: ${{ needs.change-detection.outputs.federated_settings_identity_provider == 'true' || inputs.test_group == 'federated_settings_identity_provider' }}
641+
runs-on: ubuntu-latest
642+
steps:
643+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
644+
with:
645+
ref: ${{ inputs.ref || github.ref }}
646+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
647+
with:
648+
go-version-file: 'go.mod'
649+
- uses: hashicorp/setup-terraform@a1502cd9e758c50496cc9ac5308c4843bcd56d36
650+
with:
651+
terraform_version: ${{ inputs.terraform_version }}
652+
terraform_wrapper: false
653+
- name: Acceptance Tests
654+
env:
655+
MONGODB_ATLAS_BASE_URL: ${{ inputs.mongodb_atlas_base_url }}
656+
MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.mongodb_atlas_public_key }}
657+
MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.mongodb_atlas_private_key }}
658+
MONGODB_ATLAS_FEDERATION_SETTINGS_ID: ${{ inputs.mongodb_atlas_federation_settings_id }}
659+
MONGODB_ATLAS_FEDERATED_OKTA_IDP_ID: ${{ inputs.mongodb_atlas_federatied_okta_idp_id }}
660+
MONGODB_ATLAS_FEDERATED_IDP_ID: ${{ inputs.mongodb_atlas_federatied_idp_id }}
661+
MONGODB_ATLAS_FEDERATED_OIDC_IDP_ID: ${{ inputs.mongodb_atlas_federatied_oidc_idp_id }}
662+
MONGODB_ATLAS_FEDERATED_SSO_URL: ${{ inputs.mongodb_atlas_federatied_sso_url }}
663+
MONGODB_ATLAS_FEDERATED_ISSUER_URI: ${{ inputs.mongodb_atlas_federatied_issuer_uri }}
664+
MONGODB_ATLAS_FEDERATED_PROJECT_ID: ${{ inputs.mongodb_atlas_federatied_project_id }}
665+
MONGODB_ATLAS_FEDERATED_ORG_ID: ${{ inputs.mongodb_atlas_federatied_org_id }}
666+
TEST_REGEX: "^TestAccFederatedSettingsIdentityProvider"
667+
run: make testacc
668+

‎.github/workflows/acceptance-tests.yml

+8
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,11 @@ jobs:
6868
azure_service_principal_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.AZURE_SERVICE_PRINCIPAL_ID_QA || vars.AZURE_SERVICE_PRINCIPAL_ID }}
6969
azure_tenant_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.AZURE_TENANT_ID_QA || vars.AZURE_TENANT_ID }}
7070
aws_secret_name: ${{ inputs.atlas_cloud_env == 'qa' && vars.AWS_SECRET_NAME_QA || vars.AWS_SECRET_NAME }}
71+
mongodb_atlas_federation_settings_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.MONGODB_ATLAS_FEDERATION_SETTINGS_ID_QA || vars.MONGODB_ATLAS_FEDERATION_SETTINGS_ID }}
72+
mongodb_atlas_federatied_okta_idp_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.MONGODB_ATLAS_FEDERATED_OKTA_IDP_ID_QA || vars.MONGODB_ATLAS_FEDERATED_OKTA_IDP_ID }}
73+
mongodb_atlas_federatied_idp_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.MONGODB_ATLAS_FEDERATED_IDP_ID_QA || vars.MONGODB_ATLAS_FEDERATED_IDP_ID }}
74+
mongodb_atlas_federatied_oidc_idp_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.MONGODB_ATLAS_FEDERATED_OIDC_IDP_ID_QA || vars.MONGODB_ATLAS_FEDERATED_OIDC_IDP_ID }}
75+
mongodb_atlas_federatied_sso_url: ${{ vars.MONGODB_ATLAS_FEDERATED_SSO_URL }}
76+
mongodb_atlas_federatied_issuer_uri: ${{ vars.MONGODB_ATLAS_FEDERATED_ISSUER_URI }}
77+
mongodb_atlas_federatied_project_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.MONGODB_ATLAS_FEDERATED_PROJECT_ID_QA || vars.MONGODB_ATLAS_FEDERATED_PROJECT_ID }}
78+
mongodb_atlas_federatied_org_id: ${{ inputs.atlas_cloud_env == 'qa' && vars.MONGODB_ATLAS_FEDERATED_ORG_ID_QA || vars.MONGODB_ATLAS_FEDERATED_ORG_ID }}

‎internal/service/federatedsettingsidentityprovider/data_source_federated_settings_identity_provider_test.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import (
99
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
1010
)
1111

12-
func TestAccFedDSFederatedSettingsIdentityProvider_samlBasic(t *testing.T) {
13-
acc.SkipTestExtCred(t)
12+
func TestAccFederatedSettingsIdentityProviderDS_samlBasic(t *testing.T) {
1413
var (
1514
resourceName = "data.mongodbatlas_federated_settings_identity_provider.test"
1615
federatedSettingsID = os.Getenv("MONGODB_ATLAS_FEDERATION_SETTINGS_ID")
@@ -28,10 +27,9 @@ func TestAccFedDSFederatedSettingsIdentityProvider_samlBasic(t *testing.T) {
2827
resource.TestCheckResourceAttrSet(resourceName, "federation_settings_id"),
2928
resource.TestCheckResourceAttrSet(resourceName, "associated_orgs.#"),
3029
resource.TestCheckResourceAttrSet(resourceName, "acs_url"),
31-
resource.TestCheckResourceAttrSet(resourceName, "display_name"),
32-
resource.TestCheckResourceAttr(resourceName, "display_name", "TestConfig"),
30+
resource.TestCheckResourceAttr(resourceName, "display_name", "SAML-test"),
3331
resource.TestCheckResourceAttr(resourceName, "protocol", "SAML"),
34-
resource.TestCheckResourceAttr(resourceName, "okta_idp_id", "0oafbloyfixJjK4VI357"),
32+
resource.TestCheckResourceAttr(resourceName, "okta_idp_id", "0oa10l49zjuBdjDT1358"),
3533
resource.TestCheckResourceAttr(resourceName, "idp_id", idpID),
3634
resource.TestCheckResourceAttr(resourceName, "federation_settings_id", federatedSettingsID),
3735
),
@@ -41,7 +39,6 @@ func TestAccFedDSFederatedSettingsIdentityProvider_samlBasic(t *testing.T) {
4139
}
4240

4341
func TestAccFedDSFederatedSettingsIdentityProvider_oidcBasic(t *testing.T) {
44-
acc.SkipTestExtCred(t)
4542
var (
4643
resourceName = "data.mongodbatlas_federated_settings_identity_provider.test"
4744
federatedSettingsID = os.Getenv("MONGODB_ATLAS_FEDERATION_SETTINGS_ID")
@@ -56,7 +53,6 @@ func TestAccFedDSFederatedSettingsIdentityProvider_oidcBasic(t *testing.T) {
5653
Check: resource.ComposeTestCheckFunc(
5754
testAccCheckMongoDBAtlasFederatedSettingsIdentityProvidersExists(resourceName),
5855

59-
resource.TestCheckResourceAttrSet(resourceName, "federation_settings_id"),
6056
resource.TestCheckResourceAttrSet(resourceName, "associated_orgs.#"),
6157
resource.TestCheckResourceAttrSet(resourceName, "audience_claim.#"),
6258
resource.TestCheckResourceAttrSet(resourceName, "client_id"),

‎internal/service/federatedsettingsidentityprovider/data_source_federated_settings_identity_providers_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import (
1111
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
1212
)
1313

14-
func TestAccFedDSFederatedSettingsIdentityProviders_basic(t *testing.T) {
15-
acc.SkipTestExtCred(t)
14+
func TestAccFederatedSettingsIdentityProvidersDS_basic(t *testing.T) {
1615
var (
1716
resourceName = "data.mongodbatlas_federated_settings_identity_providers.test"
1817
federatedSettingsID = os.Getenv("MONGODB_ATLAS_FEDERATION_SETTINGS_ID")

‎internal/service/federatedsettingsidentityprovider/resource_federated_settings_identity_provider_test.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import (
1313
"go.mongodb.org/atlas-sdk/v20231115005/admin"
1414
)
1515

16-
func TestAccFedRSFederatedSettingsIdentityProvider_basic(t *testing.T) {
17-
acc.SkipTestExtCred(t)
16+
func TestAccFederatedSettingsIdentityProviderRS_basic(t *testing.T) {
1817
var (
1918
federatedSettingsIdentityProvider admin.FederationIdentityProvider
2019
resourceName = "mongodbatlas_federated_settings_identity_provider.test"
@@ -50,8 +49,7 @@ func TestAccFedRSFederatedSettingsIdentityProvider_basic(t *testing.T) {
5049
})
5150
}
5251

53-
func TestAccFedRSFederatedSettingsIdentityProvider_importBasic(t *testing.T) {
54-
acc.SkipTestExtCred(t)
52+
func TestAccFederatedSettingsIdentityProviderRS_importBasic(t *testing.T) {
5553
var (
5654
resourceName = "mongodbatlas_federated_settings_identity_provider.test"
5755
federationSettingsID = os.Getenv("MONGODB_ATLAS_FEDERATION_SETTINGS_ID")

0 commit comments

Comments
 (0)