diff --git a/cmd/ctrlc/root/sync/google/gke/gke.go b/cmd/ctrlc/root/sync/google/gke/gke.go index 576898d..fdee9da 100644 --- a/cmd/ctrlc/root/sync/google/gke/gke.go +++ b/cmd/ctrlc/root/sync/google/gke/gke.go @@ -365,10 +365,11 @@ 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", + SourceKind: "GoogleKubernetesEngine", + SourceVersion: "ctrlplane.dev/kubernetes/cluster/v1", + + TargetKind: "GoogleNetwork", + TargetVersion: "ctrlplane.dev/network/v1", 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