Merge pull request #1005 from hashicorp/brandonc/fix_flaky_revoke_idp_cert_test

Update admin_setting_saml_integration_test.go

Author: brandonc

.github/workflows/nightly-tfe-ci.yml

@@ -62,16 +62,16 @@ jobs:
           exit 1
 
   slack-notify:
-    needs: [ tests ]
-    if: ${{ needs.tests.result == 'failure' }}
+    needs: [ tests-summarize ]
+    if: always() && (needs.tests-summarize.result == 'failure')
     runs-on: ubuntu-latest
     steps:
       - name: Send slack notification on failure
         uses: slackapi/slack-github-action@007b2c3c751a190b6f0f040e47ed024deaa72844 # v1.23.0
         with:
           payload: |
             {
-              "text": ":x::moon::sob: Nightly TFE tests *FAILED*",
+              "text": ":x::moon::sob: Nightly TFE tests *FAILED* on ${{ github.repository }}",
               "attachments": [
                 {
                   "color": "#C41E3A",

admin_setting_saml_integration_test.go

@@ -116,20 +116,16 @@ func TestAdminSettings_SAML_Update(t *testing.T) {
 		})
 		require.Error(t, err)
 	})
-}
-
-func TestAdminSettings_SAML_RevokeIdpCert(t *testing.T) {
-	skipUnlessEnterprise(t)
 
-	client := testClient(t)
-	ctx := context.Background()
+	t.Run("revoke IDP cert", func(t *testing.T) {
+		_, err := client.Admin.Settings.SAML.Update(ctx, AdminSAMLSettingsUpdateOptions{
+			Enabled: Bool(true),
+			IDPCert: String("anotherTestCert"),
+		})
+		require.NoError(t, err)
 
-	samlSettings, err := client.Admin.Settings.SAML.Read(ctx)
-	require.NoError(t, err)
-	if !samlSettings.Enabled {
-		t.Skip("SAML is not enabled, skipping Revoke IDP Cert test.")
-	}
-	samlSettings, err = client.Admin.Settings.SAML.RevokeIdpCert(ctx)
-	require.NoError(t, err)
-	assert.NotNil(t, samlSettings.IDPCert)
+		samlSettings, err = client.Admin.Settings.SAML.RevokeIdpCert(ctx)
+		require.NoError(t, err)
+		assert.NotNil(t, samlSettings.IDPCert)
+	})
 }