Merge pull request #51 from ConductorOne/goldschmidt/fix-sync-secrets

fix: sync fail when sync secrets is false

Author: johnallers

pkg/connector/connector.go

@@ -20,9 +20,9 @@ type Connector struct {
 // ResourceSyncers returns a ResourceSyncer for each resource type that should be synced from the upstream service.
 func (d *Connector) ResourceSyncers(ctx context.Context) []connectorbuilder.ResourceSyncer {
 	builders := []connectorbuilder.ResourceSyncer{
-		newUserBuilder(d.Client),
+		newUserBuilder(d.Client, d.syncSecrets),
 		newAccountRoleBuilder(d.Client),
-		newDatabaseBuilder(d.Client),
+		newDatabaseBuilder(d.Client, d.syncSecrets),
 	}
 
 	if d.syncSecrets {

pkg/connector/databases.go

@@ -16,13 +16,14 @@ import (
 type databaseBuilder struct {
 	resourceType *v2.ResourceType
 	client       *snowflake.Client
+	syncSecrets  bool
 }
 
 func (o *databaseBuilder) ResourceType(ctx context.Context) *v2.ResourceType {
 	return databaseResourceType
 }
 
-func databaseResource(database *snowflake.Database) (*v2.Resource, error) {
+func databaseResource(database *snowflake.Database, syncSecrets bool) (*v2.Resource, error) {
 	profile := map[string]interface{}{
 		"name": database.Name,
 	}
@@ -31,8 +32,18 @@ func databaseResource(database *snowflake.Database) (*v2.Resource, error) {
 		rs.WithAppProfile(profile),
 	}
 
+	var opts []rs.ResourceOption
+	if syncSecrets {
+		opts = append(opts, rs.WithAnnotation(&v2.ChildResourceType{ResourceTypeId: secretResourceType.Id}))
+	}
+
 	resource, err := rs.NewAppResource(
-		database.Name, databaseResourceType, database.Name, databaseTraits, rs.WithAnnotation(&v2.ChildResourceType{ResourceTypeId: secretResourceType.Id}))
+		database.Name,
+		databaseResourceType,
+		database.Name,
+		databaseTraits,
+		opts...,
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -53,7 +64,7 @@ func (o *databaseBuilder) List(ctx context.Context, parentResourceID *v2.Resourc
 
 	var resources []*v2.Resource
 	for _, database := range databases {
-		resource, err := databaseResource(&database) // #nosec G601
+		resource, err := databaseResource(&database, o.syncSecrets) // #nosec G601
 		if err != nil {
 			return nil, "", nil, wrapError(err, "failed to create database resource")
 		}
@@ -125,9 +136,10 @@ func (o *databaseBuilder) Grants(ctx context.Context, resource *v2.Resource, pTo
 	return grants, "", nil, nil
 }
 
-func newDatabaseBuilder(client *snowflake.Client) *databaseBuilder {
+func newDatabaseBuilder(client *snowflake.Client, syncSecrets bool) *databaseBuilder {
 	return &databaseBuilder{
 		resourceType: databaseResourceType,
 		client:       client,
+		syncSecrets:  syncSecrets,
 	}
 }

pkg/connector/users.go

@@ -13,13 +13,14 @@ import (
 type userBuilder struct {
 	resourceType *v2.ResourceType
 	client       *snowflake.Client
+	syncSecrets  bool
 }
 
 func (o *userBuilder) ResourceType(ctx context.Context) *v2.ResourceType {
 	return userResourceType
 }
 
-func userResource(ctx context.Context, user *snowflake.User) (*v2.Resource, error) {
+func userResource(ctx context.Context, user *snowflake.User, syncSecrets bool) (*v2.Resource, error) {
 	profile := map[string]interface{}{
 		"email":        user.Email,
 		"login":        user.Login,
@@ -52,12 +53,18 @@ func userResource(ctx context.Context, user *snowflake.User) (*v2.Resource, erro
 			displayName = user.Login
 		}
 	}
+
+	var opts []rs.ResourceOption
+	if syncSecrets {
+		opts = append(opts, rs.WithAnnotation(&v2.ChildResourceType{ResourceTypeId: rsaPublicKeyResourceType.Id}))
+	}
+
 	resource, err := rs.NewUserResource(
 		displayName,
 		userResourceType,
 		user.Username,
 		userTraits,
-		rs.WithAnnotation(&v2.ChildResourceType{ResourceTypeId: rsaPublicKeyResourceType.Id}),
+		opts...,
 	)
 
 	if err != nil {
@@ -113,7 +120,7 @@ func (o *userBuilder) List(ctx context.Context, parentResourceID *v2.ResourceId,
 
 	var resources []*v2.Resource
 	for _, user := range users {
-		resource, err := userResource(ctx, &user) // #nosec G601
+		resource, err := userResource(ctx, &user, o.syncSecrets) // #nosec G601
 		if err != nil {
 			return nil, "", nil, wrapError(err, "failed to create user resource")
 		}
@@ -143,9 +150,10 @@ func (o *userBuilder) Grants(ctx context.Context, resource *v2.Resource, pToken
 	return nil, "", nil, nil
 }
 
-func newUserBuilder(client *snowflake.Client) *userBuilder {
+func newUserBuilder(client *snowflake.Client, syncSecrets bool) *userBuilder {
 	return &userBuilder{
 		resourceType: userResourceType,
 		client:       client,
+		syncSecrets:  syncSecrets,
 	}
 }