APIGOV-32516 - update tests

Author: sbolosan

pkg/agent/idplifecycle_test.go

@@ -80,13 +80,6 @@ func makeIDPConfig(metadataURL string) *config.IDPConfiguration {
 	}
 }
 
-// idpInstanceRI builds a *ResourceInstance that looks like a fetched IdentityProvider.
-func idpInstanceRI(name string) *apiv1.ResourceInstance {
-	idp := management.NewIdentityProvider(name)
-	ri, _ := idp.AsInstance()
-	return ri
-}
-
 // idpMetadataInstanceRI builds a *ResourceInstance that looks like a fetched IdentityProviderMetadata
 // with idpScopeName as the scope name — used to test the ManageIDPResource Engage query path.
 func idpMetadataInstanceRI(idpScopeName string) *apiv1.ResourceInstance {
@@ -839,16 +832,13 @@ func TestManageIDPResource(t *testing.T) {
 	}
 
 	tests := map[string]struct {
-		metadata               *oauth.AuthorizationServerMetadata
-		preloadCacheName       string
-		tokenEndpointInstances []*apiv1.ResourceInstance
-		tokenEndpointErr       error
-		metadataURLInstances   []*apiv1.ResourceInstance
-		createErr              error
-		assertResult           func(t *testing.T, result string)
-		wantQueryCount         int
-		wantCreateCalled       bool
-		wantCachedAfter        bool
+		metadata         *oauth.AuthorizationServerMetadata
+		preloadCacheName string
+		createErr        error
+		assertResult     func(t *testing.T, result string)
+		wantQueryCount   int
+		wantCreateCalled bool
+		wantCachedAfter  bool
 	}{
 		"nil metadata returns empty without any API call": {
 			metadata:       nil,
@@ -869,13 +859,6 @@ func TestManageIDPResource(t *testing.T) {
 			wantCreateCalled: true,
 			wantCachedAfter:  true,
 		},
-		"creates and caches resource when not in cache": {
-			metadata:         testMeta,
-			assertResult:     func(t *testing.T, result string) { assert.NotEmpty(t, result) },
-			wantQueryCount:   1,
-			wantCreateCalled: true,
-			wantCachedAfter:  true,
-		},
 		"create failure returns empty name and nothing cached": {
 			metadata:         testMeta,
 			createErr:        errors.New("create failed"),
@@ -899,10 +882,7 @@ func TestManageIDPResource(t *testing.T) {
 			apicClient := &mock.Client{
 				GetAPIV1ResourceInstancesMock: func(_ map[string]string, _ string) ([]*apiv1.ResourceInstance, error) {
 					queryCount++
-					if queryCount == 1 {
-						return tc.tokenEndpointInstances, tc.tokenEndpointErr
-					}
-					return tc.metadataURLInstances, nil
+					return []*apiv1.ResourceInstance{}, nil
 				},
 				CreateOrUpdateResourceMock: func(ri apiv1.Interface) (*apiv1.ResourceInstance, error) {
 					createCalled = true

pkg/authz/oauth/idplifecycle.go

@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	defaultIdpClientTimeoutSeconds = 60
+	defaultIDPClientTimeoutSeconds = 60
 )
 
 // IDPClient is the subset of apic.Client used by the IdP lifecycle manager,
@@ -36,7 +36,7 @@ type IDPEngageLifecycle interface {
 	// resources in Engage using pre-resolved metadata — no Provider or outbound HTTP fetch required.
 	// idpCfg is optional (may be nil for the v7 path); when set it is passed to the IDPResourceBuilder.
 	// Returns the Engage IdentityProvider resource name.
-	CreateEngageResourcesFromMetadata(idpLogger log.FieldLogger, idpCfg corecfg.IDPConfig, idpType, idpName string, metadata *AuthorizationServerMetadata, baseUrl string, envPolicies management.EnvironmentPoliciesCredentials) (string, error)
+	CreateEngageResourcesFromMetadata(idpLogger log.FieldLogger, idpCfg corecfg.IDPConfig, idpType, idpName string, metadata *AuthorizationServerMetadata, baseURL string, envPolicies management.EnvironmentPoliciesCredentials) (string, error)
 }
 
 // LifecycleOption configures an idpEngageLifecycle.
@@ -61,13 +61,13 @@ func NewIDPEngageLifecycle(client IDPClient, opts ...LifecycleOption) IDPEngageL
 	return l
 }
 
-func (l *idpEngageLifecycle) CreateEngageResourcesFromMetadata(idpLogger log.FieldLogger, idpCfg corecfg.IDPConfig, idpType, idpName string, metadata *AuthorizationServerMetadata, baseUrl string, envPolicies management.EnvironmentPoliciesCredentials) (string, error) {
+func (l *idpEngageLifecycle) CreateEngageResourcesFromMetadata(idpLogger log.FieldLogger, idpCfg corecfg.IDPConfig, idpType, idpName string, metadata *AuthorizationServerMetadata, baseURL string, envPolicies management.EnvironmentPoliciesCredentials) (string, error) {
 	tokenEndpoint := metadata.TokenEndpoint
 
 	idpLogger.Debug("querying Engage for existing IdentityProvider resource")
 	existing, err := l.client.GetAPIV1ResourceInstances(
 		map[string]string{"query": fmt.Sprintf("spec.tokenEndpoint==\"%s\"", tokenEndpoint)},
-		baseUrl+"/"+management.NewIdentityProviderMetadata("", "").PluralName(),
+		baseURL+"/"+management.NewIdentityProviderMetadata("", "").PluralName(),
 	)
 	if err != nil {
 		return "", err
@@ -122,7 +122,7 @@ func (l *idpEngageLifecycle) buildIdentityProviderFromMetadata(idpLogger log.Fie
 	res := management.NewIdentityProvider(name)
 	res.Spec = management.IdentityProviderSpec{
 		ProviderType:  idpType,
-		ClientTimeout: defaultIdpClientTimeoutSeconds,
+		ClientTimeout: defaultIDPClientTimeoutSeconds,
 	}
 	return res, nil
 }

pkg/config/centralconfig_test.go

@@ -68,6 +68,8 @@ func TestDiscoveryAgentConfig(t *testing.T) {
 	centralConfig.APIServerVersion = "v1alpha1"
 
 	assert.Equal(t, centralConfig.URL+"/apis/management/v1alpha1/environments/eee/apiservices", cfg.GetServicesURL())
+	assert.Equal(t, centralConfig.URL+"/apis/management/v1alpha1", cfg.GetAPIServerVersionURL())
+	assert.Equal(t, centralConfig.URL+"/apis/management/v1alpha1/environments/", cfg.GetAPIServerURL())
 
 	centralConfig.PollInterval = 0
 	err = cfgValidator.ValidateCfg()