From c23bdeaaef902943b39b8af2e94b84c6dc5d6e97 Mon Sep 17 00:00:00 2001 From: Zachary Blasczyk Date: Fri, 2 May 2025 14:35:38 -0500 Subject: [PATCH 1/2] fix: GKE scan --- cmd/ctrlc/root/sync/google/gke/gke.go | 11 +++++++---- internal/api/resource_provider.go | 10 ++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cmd/ctrlc/root/sync/google/gke/gke.go b/cmd/ctrlc/root/sync/google/gke/gke.go index 576898d..a259e13 100644 --- a/cmd/ctrlc/root/sync/google/gke/gke.go +++ b/cmd/ctrlc/root/sync/google/gke/gke.go @@ -365,10 +365,13 @@ var relationshipRules = []api.CreateResourceRelationshipRule{ Name: "Google Cloud Cluster Network", DependencyType: api.ProvisionedIn, - SourceKind: "ctrlplane.dev/kubernetes/cluster/v1", - SourceVersion: "GoogleKubernetesEngine", - TargetKind: "ctrlplane.dev/network/v1", - TargetVersion: "GoogleNetwork", + // Source (the Cluster) + SourceKind: "GoogleKubernetesEngine", // Matches Resource Kind + SourceVersion: "ctrlplane.dev/kubernetes/cluster/v1", // Matches Resource Version + + // Target (the Network) + TargetKind: "GoogleNetwork", // Matches Target Resource Kind + TargetVersion: "ctrlplane.dev/network/v1", // Matches Target Resource Version MetadataKeysMatch: []string{"google/project", "network/name"}, }, diff --git a/internal/api/resource_provider.go b/internal/api/resource_provider.go index 06781c0..f995475 100644 --- a/internal/api/resource_provider.go +++ b/internal/api/resource_provider.go @@ -45,13 +45,15 @@ func NewResourceProvider(client *ClientWithResponses, workspaceId string, name s Name: provider.Name, ID: provider.Id, client: client, + workspaceId: workspaceId, }, nil } type ResourceProvider struct { - ID string - Name string - client *ClientWithResponses + ID string + Name string + client *ClientWithResponses + workspaceId string } type AgentResource struct { @@ -104,7 +106,7 @@ func (r *ResourceProvider) UpsertResource(ctx context.Context, resources []Agent func (r *ResourceProvider) AddResourceRelationshipRule(ctx context.Context, rules []CreateResourceRelationshipRule) error { for _, rule := range rules { - rule.WorkspaceId = r.ID + rule.WorkspaceId = r.workspaceId resp, err := r.client.UpsertResourceRelationshipRuleWithResponse(ctx, rule) if err != nil { return err From df396cbcf667ba978fc1d304e6e8d57fb6a7b9a7 Mon Sep 17 00:00:00 2001 From: Zachary Blasczyk Date: Fri, 2 May 2025 14:36:48 -0500 Subject: [PATCH 2/2] fix --- cmd/ctrlc/root/sync/google/gke/gke.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cmd/ctrlc/root/sync/google/gke/gke.go b/cmd/ctrlc/root/sync/google/gke/gke.go index a259e13..fdee9da 100644 --- a/cmd/ctrlc/root/sync/google/gke/gke.go +++ b/cmd/ctrlc/root/sync/google/gke/gke.go @@ -365,13 +365,11 @@ var relationshipRules = []api.CreateResourceRelationshipRule{ Name: "Google Cloud Cluster Network", DependencyType: api.ProvisionedIn, - // Source (the Cluster) - SourceKind: "GoogleKubernetesEngine", // Matches Resource Kind - SourceVersion: "ctrlplane.dev/kubernetes/cluster/v1", // Matches Resource Version - - // Target (the Network) - TargetKind: "GoogleNetwork", // Matches Target Resource Kind - TargetVersion: "ctrlplane.dev/network/v1", // Matches Target Resource Version + SourceKind: "GoogleKubernetesEngine", + SourceVersion: "ctrlplane.dev/kubernetes/cluster/v1", + + TargetKind: "GoogleNetwork", + TargetVersion: "ctrlplane.dev/network/v1", MetadataKeysMatch: []string{"google/project", "network/name"}, },