Merge pull request #394 from okta/update-OAuthSettingClient

update OAuthSettingClient
okta · Jun 23, 2023 · b145286 · b145286
2 parents bf67959 + 89e46b6
commit b145286
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 27 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,23 +3,11 @@
 version: 2.1
 
 orbs:
-  platform-orb: okta/general-platform-helpers@1.2.2
+  platform-orb: okta/general-platform-helpers@1.5
 
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  cache-secrets:
-    machine: true
-    resource_class: okta/generic-linux-x86
-    environment:
-      VAULT_ADDR: https://vault.aue1e.saasure.net
-    steps:
-      - checkout
-      - run:
-          name: "Vault login"
-          command: |
-            vault login -method=userpass username=$vault_username password=$vault_password > /dev/null 2>&1
-      - platform-orb/save-dependencies
 
   test-v2:
     docker:
@@ -50,7 +38,9 @@ jobs:
 workflows:
   "Circle CI Tests":
     jobs:
-      - cache-secrets
+      - platform-orb/job-secrets-obtain:
+          name: cache-secrets
+          secret-key: "GO111MODULE;OKTA_CLIENT_CLIENTID;OKTA_CLIENT_ORGURL;OKTA_CLIENT_PRIVATEKEY;OKTA_CLIENT_TOKEN;OKTA_CCI"
       - test-v2:
           requires:
             - cache-secrets

diff --git a/.generator/okta-management-APIs-oasv3-enum-inheritance.yaml b/.generator/okta-management-APIs-oasv3-enum-inheritance.yaml
@@ -20576,10 +20576,8 @@ components:
           type: string
         recordType:
           $ref: '#/components/schemas/DNSRecordType'
-        values:
-          type: array
-          items:
-            type: string
+        verificationValue:
+          type: string
     DNSRecordType:
       type: string
       enum:
@@ -23466,6 +23464,8 @@ components:
           type: string
         wildcard_redirect:
           type: string
+        jwks_uri:
+          type: string
     OpenIdConnectApplicationSettingsClientKeys:
       type: object
       properties:

diff --git a/.generator/templates/api_application_test.go b/.generator/templates/api_application_test.go
@@ -120,7 +120,7 @@ func Test_Activate_Application(t *testing.T) {
 }
 
 func Test_Application_Users_Operations(t *testing.T) {
-	if os.Getenv("OKTA_TRAVIS_CI") == "yes" {
+	if os.Getenv("OKTA_CCI") == "yes" {
 		time.Sleep(time.Duration(90))
 	}
 	createdApp, _, err := setupBasicAuthApplication(randomTestString())
@@ -188,7 +188,7 @@ func Test_Application_Users_Operations(t *testing.T) {
 }
 
 func Test_Application_Groups_Operations(t *testing.T) {
-	if os.Getenv("OKTA_TRAVIS_CI") == "yes" {
+	if os.Getenv("OKTA_CCI") == "yes" {
 		time.Sleep(time.Duration(90))
 	}
 	createdApp, _, err := setupBasicAuthApplication(randomTestString())
@@ -225,7 +225,7 @@ func Test_Application_Groups_Operations(t *testing.T) {
 }
 
 func Test_CSR_For_Application(t *testing.T) {
-	if os.Getenv("OKTA_TRAVIS_CI") == "yes" {
+	if os.Getenv("OKTA_CCI") == "yes" {
 		time.Sleep(time.Duration(90))
 	}
 	createdApp, _, err := setupBasicAuthApplication(randomTestString())
@@ -270,7 +270,7 @@ func Test_CSR_For_Application(t *testing.T) {
 }
 
 func TestGetDefaultProvisioningConnectionForApplication(t *testing.T) {
-	if os.Getenv("OKTA_TRAVIS_CI") == "yes" {
+	if os.Getenv("OKTA_CCI") == "yes" {
 		time.Sleep(time.Duration(90))
 	}
 	createdApp, _, err := setupOrg2OrgApplication(randomTestString())
@@ -321,7 +321,7 @@ func TestGetDefaultProvisioningConnectionForApplication(t *testing.T) {
 // }
 
 func Test_Upload_Application_Logo(t *testing.T) {
-	if os.Getenv("OKTA_TRAVIS_CI") == "yes" {
+	if os.Getenv("OKTA_CCI") == "yes" {
 		time.Sleep(time.Duration(180))
 	}
 	createdApp, _, err := setupBasicAuthApplication(randomTestString())
@@ -340,7 +340,7 @@ func Test_Upload_Application_Logo(t *testing.T) {
 }
 
 func Test_Application_Key_Operation(t *testing.T) {
-	if os.Getenv("OKTA_TRAVIS_CI") == "yes" {
+	if os.Getenv("OKTA_CCI") == "yes" {
 		time.Sleep(time.Duration(180))
 	}
 	createdApp1, _, err := setupBasicAuthApplication(randomTestString())
@@ -379,7 +379,7 @@ func Test_Application_Key_Operation(t *testing.T) {
 }
 
 func Test_Scope_Consent_Grant_Operation_For_Application(t *testing.T) {
-	if os.Getenv("OKTA_TRAVIS_CI") == "yes" {
+	if os.Getenv("OKTA_CCI") == "yes" {
 		time.Sleep(time.Duration(180))
 	}
 	createdApp, _, err := setupOIDCApplication(randomTestString())

diff --git a/.generator/templates/private_key_test.go b/.generator/templates/private_key_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func Test_Private_Key_Request_Can_Create_User(t *testing.T) {
-	if os.Getenv("OKTA_TRAVIS_CI") != "yes" {
+	if os.Getenv("OKTA_CCI") != "yes" {
 		t.Skip("Skipping testing not in CI environment")
 	}
 	configuration := NewConfiguration(WithAuthorizationMode("PrivateKey"), WithScopes([]string{"okta.users.manage"}))
@@ -23,7 +23,7 @@ func Test_Private_Key_Request_Can_Create_User(t *testing.T) {
 }
 
 func Test_JWT_Request_Can_Create_User(t *testing.T) {
-	if os.Getenv("OKTA_TRAVIS_CI") != "yes" {
+	if os.Getenv("OKTA_CCI") != "yes" {
 		t.Skip("Skipping testing not in CI environment")
 	}
 	configuration := NewConfiguration(WithAuthorizationMode("JWT"), WithScopes([]string{"okta.users.manage"}))