add tagging

Author: jsbroks

cmd/ctrlc/root/sync/aws/eks/eks.go

@@ -297,6 +297,10 @@ func initClusterMetadata(cluster *types.Cluster, region string) map[string]strin
 		}
 	}
 
+	for key, value := range cluster.Tags {
+		metadata[fmt.Sprintf("tags/%s", key)] = value
+	}
+
 	return metadata
 }
 

cmd/ctrlc/root/sync/aws/rds/rds.go

@@ -438,6 +438,12 @@ func buildInstanceMetadata(instance *types.DBInstance, region, host string, port
 		metadata["aws/is-aurora"] = "false"
 	}
 
+	for _, tag := range instance.TagList {
+		if tag.Key != nil && tag.Value != nil {
+			metadata[fmt.Sprintf("tags/%s", *tag.Key)] = *tag.Value
+		}
+	}
+
 	return metadata
 }
 

cmd/ctrlc/root/sync/google/bigtable/bigtable.go

@@ -197,7 +197,7 @@ func initInstanceMetadata(instance *bigtableadmin.Instance, project string) map[
 		versionMajor, versionMinor, versionPatch = "0", "1", "0"
 	}
 
-	return map[string]string{
+	metadata := map[string]string{
 		kinds.DBMetadataType:  "bigtable",
 		kinds.DBMetadataHost:  instance.Name,
 		kinds.DBMetadataName:  instance.Name,
@@ -216,6 +216,12 @@ func initInstanceMetadata(instance *bigtableadmin.Instance, project string) map[
 		"google/state":         strings.ToLower(instance.State),
 		"google/type":          instance.Type,
 	}
+
+	for key, value := range instance.Labels {
+		metadata[fmt.Sprintf("tags/%s", key)] = value
+	}
+
+	return metadata
 }
 
 // processClusters handles processing of Bigtable clusters

cmd/ctrlc/root/sync/google/buckets/buckets.go

@@ -289,6 +289,10 @@ func initBucketMetadata(bucket *storage.Bucket, project string) map[string]strin
 		}
 	}
 
+	for key, value := range bucket.Labels {
+		metadata[fmt.Sprintf("tags/%s", key)] = value
+	}
+
 	return metadata
 }
 

cmd/ctrlc/root/sync/google/cloudsql/cloudsql.go

@@ -364,6 +364,10 @@ func buildInstanceMetadata(instance *sqladmin.DatabaseInstance, project, region,
 		metadata["compute/availability-type"] = instance.Settings.AvailabilityType
 	}
 
+	for key, value := range instance.Settings.UserLabels {
+		metadata[fmt.Sprintf("tags/%s", key)] = value
+	}
+
 	return metadata
 }
 

cmd/ctrlc/root/sync/google/gke/gke.go

@@ -248,8 +248,8 @@ func initClusterMetadata(cluster *container.Cluster, project string) map[string]
 	autoscalingNodePools := 0
 	for _, nodePool := range cluster.NodePools {
 		metadata[fmt.Sprintf("kubernetes/node-pool/%s/name", nodePool.Name)] = nodePool.Name
-		metadata[fmt.Sprintf("kubernetes/node-pool/%s/version", nodePool.Version)] = nodePool.Version
-		metadata[fmt.Sprintf("kubernetes/node-pool/%s/status", nodePool.Status)] = nodePool.Status
+		metadata[fmt.Sprintf("kubernetes/node-pool/%s/version", nodePool.Name)] = nodePool.Version
+		metadata[fmt.Sprintf("kubernetes/node-pool/%s/status", nodePool.Name)] = nodePool.Status
 
 		if nodePool.Config != nil {
 			if nodePool.Config.MachineType != "" {
@@ -362,6 +362,10 @@ func initClusterMetadata(cluster *container.Cluster, project string) map[string]
 		metadata["operations/monitoring"] = cluster.MonitoringService
 	}
 
+	for key, value := range cluster.ResourceLabels {
+		metadata[fmt.Sprintf("tags/%s", key)] = value
+	}
+
 	return metadata
 }
 

cmd/ctrlc/root/sync/google/redis/redis.go

@@ -272,6 +272,10 @@ func initInstanceMetadata(instance *redis.Instance, project string) map[string]s
 		}
 	}
 
+	for key, value := range instance.Labels {
+		metadata[fmt.Sprintf("tags/%s", key)] = value
+	}
+
 	return metadata
 }
 

cmd/ctrlc/root/sync/google/secrets/secrets.go

@@ -317,6 +317,10 @@ func initSecretMetadata(secret *secretmanager.Secret, project string) map[string
 		}
 	}
 
+	for key, value := range secret.Labels {
+		metadata[fmt.Sprintf("tags/%s", key)] = value
+	}
+
 	return metadata
 }
 

cmd/ctrlc/root/sync/google/vms/vms.go

@@ -288,6 +288,10 @@ func initVMMetadata(instance *compute.Instance, project string, zone string) map
 		metadata["compute/gpu-count"] = strconv.Itoa(totalGPUs)
 	}
 
+	for key, value := range instance.Labels {
+		metadata[fmt.Sprintf("tags/%s", key)] = value
+	}
+
 	return metadata
 }