Correct autogen overwrite routine (#154)

* Correct autogen overwrite routine * update replace filter pattern and regenerate * adjust backoff routine for inconsistent role assignment def
patrickcping · Apr 24, 2023 · 128580f · 128580f
1 parent 97f7523
commit 128580f
Show file tree

Hide file tree

Showing 32 changed files with 927 additions and 2 deletions.
diff --git a/agreementmanagement/client_ext.go b/agreementmanagement/client_ext.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -92,11 +93,22 @@ func testForRetryable(r *http.Response, err error, currentBackoff time.Duration)
 	if err != nil {
 		if genericOAError, ok := err.(GenericOpenAPIError); ok && genericOAError.Model() != nil {
 			// We have an application level error
+
 			if modelError, ok := genericOAError.Model().(P1Error); ok {
+
+				// Test for unexpected errors
 				if strings.EqualFold(modelError.GetCode(), "UNEXPECTED_ERROR") {
 					log.Printf("Unexpected error detected, available for retry")
 					return backoff, true
 				}
+
+				// Test for inconsistent role state
+				m, _ := regexp.MatchString(`^Role assignment [a-z0-9\-]* cannot be deleted as it is read only`, modelError.GetMessage())
+
+				if m {
+					log.Printf("Inconsistent role assignment, available for retry")
+					return backoff, true
+				}
 			}
 		}
 	}

diff --git a/authorize/client_ext.go b/authorize/client_ext.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -92,11 +93,22 @@ func testForRetryable(r *http.Response, err error, currentBackoff time.Duration)
 	if err != nil {
 		if genericOAError, ok := err.(GenericOpenAPIError); ok && genericOAError.Model() != nil {
 			// We have an application level error
+
 			if modelError, ok := genericOAError.Model().(P1Error); ok {
+
+				// Test for unexpected errors
 				if strings.EqualFold(modelError.GetCode(), "UNEXPECTED_ERROR") {
 					log.Printf("Unexpected error detected, available for retry")
 					return backoff, true
 				}
+
+				// Test for inconsistent role state
+				m, _ := regexp.MatchString(`^Role assignment [a-z0-9\-]* cannot be deleted as it is read only`, modelError.GetMessage())
+
+				if m {
+					log.Printf("Inconsistent role assignment, available for retry")
+					return backoff, true
+				}
 			}
 		}
 	}

diff --git a/management/api_active_identity_counts.go b/management/api_active_identity_counts.go
diff --git a/management/api_applications.go b/management/api_applications.go
diff --git a/management/api_audit_activities.go b/management/api_audit_activities.go
diff --git a/management/api_authentications_per_application.go b/management/api_authentications_per_application.go
diff --git a/management/api_capabilities.go b/management/api_capabilities.go
diff --git a/management/api_gateways.go b/management/api_gateways.go
diff --git a/management/api_integration_catalog.go b/management/api_integration_catalog.go