chore: pleco upgrade to v0.9.19

charts/pleco/Chart.yaml

@@ -3,6 +3,6 @@ name: pleco
 description: Automatically removes Cloud managed services and Kubernetes resources based on tags with TTL
 type: application
 home: https://github.com/Qovery/pleco
-version: 0.9.18
-appVersion: 0.9.18
+version: 0.9.19
+appVersion: 0.9.19
 icon: https://github.com/Qovery/pleco/raw/main/assets/pleco_logo.png

charts/pleco/values.yaml

@@ -3,7 +3,7 @@ replicaCount: 1
 image:
   repository: qoveryrd/pleco
   pullPolicy: IfNotPresent
-  plecoImageTag: "0.9.18"
+  plecoImageTag: "0.9.19"
 
 cloudProvider: ""
 

cmd/version.go

@@ -19,5 +19,5 @@ func init() {
 }
 
 func GetCurrentVersion() string {
-	return "0.9.18" // ci-version-check
+	return "0.9.19" // ci-version-check
 }

pkg/aws/db_documentdb.go

@@ -100,7 +100,7 @@ func deleteDocumentDBCluster(svc rds.RDS, cluster documentDBCluster, dryRun bool
 	return nil
 }
 
-func DeleteExpiredDocumentDBClusters(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredDocumentDBClusters(sessions AWSSessions, options AwsOptions) {
 	region := *sessions.RDS.Config.Region
 	expiredClusters := listExpiredDocumentDBClusters(*sessions.RDS, options.TagName)
 

pkg/aws/db_elasticache.go

@@ -122,7 +122,7 @@ func getExpireddClusters(ECsession *elasticache.ElastiCache, tagName string) ([]
 	return expiredClusters, region
 }
 
-func DeleteExpiredElasticacheDatabases(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredElasticacheDatabases(sessions AWSSessions, options AwsOptions) {
 	expiredClusters, region := getExpireddClusters(sessions.ElastiCache, options.TagName)
 
 	count, start := common.ElemToDeleteFormattedInfos("expired Elasticache database", len(expiredClusters), region)

pkg/aws/db_rds.go

@@ -137,7 +137,7 @@ func GetRDSInstanceInfos(svc rds.RDS, databaseIdentifier string) (rdsDatabase, e
 	}, nil
 }
 
-func DeleteExpiredRDSDatabases(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredRDSDatabases(sessions AWSSessions, options AwsOptions) {
 	expiredDatabases := listExpiredRDSDatabases(*sessions.RDS, options.TagName)
 	region := *sessions.RDS.Config.Region
 
@@ -222,7 +222,7 @@ func getExpiredRDSSubnetGroups(svc rds.RDS, tagName string) []RDSSubnetGroup {
 	return expiredRDSSubnetGroups
 }
 
-func DeleteExpiredRDSSubnetGroups(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredRDSSubnetGroups(sessions AWSSessions, options AwsOptions) {
 	region := *sessions.RDS.Config.Region
 	expiredRDSSubnetGroups := getExpiredRDSSubnetGroups(*sessions.RDS, options.TagName)
 
@@ -302,7 +302,7 @@ func listExpiredCompleteRDSParameterGroups(svc rds.RDS, tagName string) []RDSPar
 	return expiredCompleteRDSParameterGroups
 }
 
-func DeleteExpiredCompleteRDSParameterGroups(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredCompleteRDSParameterGroups(sessions AWSSessions, options AwsOptions) {
 	expiredRDSParameterGroups := listExpiredCompleteRDSParameterGroups(*sessions.RDS, options.TagName)
 	region := *sessions.RDS.Config.Region
 

pkg/aws/ec2_ebs.go

@@ -126,7 +126,7 @@ func listExpiredVolumes(eksSession eks.EKS, ec2Session ec2.EC2, tagName string)
 	return expiredVolumes, nil
 }
 
-func DeleteExpiredVolumes(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredVolumes(sessions AWSSessions, options AwsOptions) {
 	expiredVolumes, err := listExpiredVolumes(*sessions.EKS, *sessions.EC2, options.TagName)
 	region := *sessions.EC2.Config.Region
 	if err != nil {

pkg/aws/ec2_elb.go

@@ -140,7 +140,7 @@ func deleteLoadBalancers(lbSession elbv2.ELBV2, loadBalancersList []ElasticLoadB
 	}
 }
 
-func DeleteExpiredLoadBalancers(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredLoadBalancers(sessions AWSSessions, options AwsOptions) {
 	expiredLoadBalancers, err := ListExpiredLoadBalancers(*sessions.EKS, *sessions.ELB, options.TagName)
 	region := *sessions.ELB.Config.Region
 	if err != nil {

pkg/aws/ec2_ssh.go

@@ -52,7 +52,7 @@ func deleteKeyPair(ec2session *ec2.EC2, keyId string) error {
 	return err
 }
 
-func DeleteExpiredKeyPairs(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredKeyPairs(sessions AWSSessions, options AwsOptions) {
 	keys := getSshKeys(sessions.EC2, options.TagName)
 	region := sessions.EC2.Config.Region
 	var expiredKeys []KeyPair

pkg/aws/eks_ecr.go

@@ -36,7 +36,7 @@ func getRepositoryImages(ecrSession *ecr.ECR, repositoryName string) []*ecr.Imag
 	return result.ImageDetails
 }
 
-func DeleteEmptyRepositories(sessions *AWSSessions, options *AwsOptions) {
+func DeleteEmptyRepositories(sessions AWSSessions, options AwsOptions) {
 	repositories := getRepositories(sessions.ECR)
 	region := sessions.ECR.Config.Region
 	var emptyRepositoryNames []string

pkg/aws/eks_root.go

@@ -232,7 +232,7 @@ func deleteNodeGroupStatus(svc eks.EKS, cluster eksCluster, nodeGroupName string
 	return nil
 }
 
-func DeleteExpiredEKSClusters(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredEKSClusters(sessions AWSSessions, options AwsOptions) {
 	clusters, err := ListTaggedEKSClusters(*sessions.EKS, options.TagName)
 	region := *sessions.EKS.Config.Region
 	if err != nil {

pkg/aws/kms_root.go

@@ -100,7 +100,7 @@ func handleKMSError(error error) {
 	}
 }
 
-func DeleteExpiredKeys(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredKeys(sessions AWSSessions, options AwsOptions) {
 	keys := getKeys(*sessions.KMS)
 	region := sessions.KMS.Config.Region
 	var expiredKeys []CompleteKey

pkg/aws/logs_cloudwatch.go

@@ -90,7 +90,7 @@ func handleCloudwatchLogsError(err error) {
 	}
 }
 
-func DeleteExpiredLogs(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredLogs(sessions AWSSessions, options AwsOptions) {
 	logs := getCloudwatchLogs(*sessions.CloudWatchLogs)
 	region := *sessions.CloudWatchLogs.Config.Region
 	var expiredLogs []CompleteLogGroup
@@ -150,7 +150,7 @@ func TagLogsForDeletion(svc cloudwatchlogs.CloudWatchLogs, tagName string, clust
 	return nil
 }
 
-func DeleteUnlinkedLogs(sessions *AWSSessions, options *AwsOptions) {
+func DeleteUnlinkedLogs(sessions AWSSessions, options AwsOptions) {
 	region := *sessions.EKS.Config.Region
 	clusters, err := ListClusters(*sessions.EKS)
 	if err != nil {

pkg/aws/run.go

@@ -49,9 +49,9 @@ type AWSSessions struct {
 	ECR            *ecr.ECR
 }
 
-type funcDeleteExpired func(sessions *AWSSessions, options *AwsOptions)
+type funcDeleteExpired func(sessions AWSSessions, options AwsOptions)
 
-func RunPlecoAWS(cmd *cobra.Command, regions []string, interval int64, wg *sync.WaitGroup, options *AwsOptions) {
+func RunPlecoAWS(cmd *cobra.Command, regions []string, interval int64, wg *sync.WaitGroup, options AwsOptions) {
 	for _, region := range regions {
 		wg.Add(1)
 		go runPlecoInRegion(region, interval, wg, options)
@@ -63,10 +63,10 @@ func RunPlecoAWS(cmd *cobra.Command, regions []string, interval int64, wg *sync.
 	go runPlecoInGlobal(cmd, interval, wg, currentSession, options)
 }
 
-func runPlecoInRegion(region string, interval int64, wg *sync.WaitGroup, options *AwsOptions) {
+func runPlecoInRegion(region string, interval int64, wg *sync.WaitGroup, options AwsOptions) {
 	defer wg.Done()
 
-	sessions := &AWSSessions{}
+	sessions := AWSSessions{}
 	currentSession := CreateSession(region)
 
 	logrus.Infof("Starting to check expired resources in region %s.", *currentSession.Config.Region)
@@ -165,7 +165,7 @@ func runPlecoInRegion(region string, interval int64, wg *sync.WaitGroup, options
 
 }
 
-func runPlecoInGlobal(cmd *cobra.Command, interval int64, wg *sync.WaitGroup, currentSession *session.Session, options *AwsOptions) {
+func runPlecoInGlobal(cmd *cobra.Command, interval int64, wg *sync.WaitGroup, currentSession *session.Session, options AwsOptions) {
 	defer wg.Done()
 
 	logrus.Info("Starting to check global expired resources.")

pkg/aws/s3_root.go

@@ -205,7 +205,7 @@ func deleteS3Buckets(s3session s3.S3, bucket string) error {
 	return nil
 }
 
-func DeleteExpiredBuckets(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredBuckets(sessions AWSSessions, options AwsOptions) {
 	buckets, err := listTaggedBuckets(*sessions.S3, options.TagName)
 	region := sessions.S3.Config.Region
 	if err != nil {

pkg/aws/vpc_eip.go

@@ -98,7 +98,7 @@ func getExpiredEIPs(ec2Session *ec2.EC2, tagName string) []ElasticIp {
 	return expiredEips
 }
 
-func DeleteExpiredElasticIps(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredElasticIps(sessions AWSSessions, options AwsOptions) {
 	expiredEips := getExpiredEIPs(sessions.EC2, options.TagName)
 
 	count, start := common.ElemToDeleteFormattedInfos("expired EIP", len(expiredEips), *sessions.EC2.Config.Region)

pkg/aws/vpc_root.go

@@ -115,7 +115,7 @@ func listTaggedVPC(ec2Session ec2.EC2, tagName string) ([]VpcInfo, error) {
 	return taggedVPCs, nil
 }
 
-func deleteVPC(sessions *AWSSessions, VpcList []VpcInfo, dryRun bool) error {
+func deleteVPC(sessions AWSSessions, VpcList []VpcInfo, dryRun bool) error {
 	if dryRun {
 		return nil
 	}
@@ -151,7 +151,7 @@ func deleteVPC(sessions *AWSSessions, VpcList []VpcInfo, dryRun bool) error {
 	return nil
 }
 
-func DeleteExpiredVPC(sessions *AWSSessions, options *AwsOptions) {
+func DeleteExpiredVPC(sessions AWSSessions, options AwsOptions) {
 	VPCs, err := listTaggedVPC(*sessions.EC2, options.TagName)
 	region := sessions.EC2.Config.Region
 	if err != nil {

pkg/daemon.go

@@ -48,7 +48,7 @@ func run(cloudProvider string, dryRun bool, interval int64, cmd *cobra.Command,
 
 func startAWS(cmd *cobra.Command, interval int64, dryRun bool, wg *sync.WaitGroup) {
 	regions, _ := cmd.Flags().GetStringSlice("aws-regions")
-	awsOptions := &aws.AwsOptions{
+	awsOptions := aws.AwsOptions{
 		DryRun:               dryRun,
 		TagName:              getCmdString(cmd, "tag-name"),
 		EnableRDS:            getCmdBool(cmd, "enable-rds"),
@@ -70,7 +70,7 @@ func startAWS(cmd *cobra.Command, interval int64, dryRun bool, wg *sync.WaitGrou
 
 func startScaleway(cmd *cobra.Command, interval int64, dryRun bool, wg *sync.WaitGroup) {
 	zones, _ := cmd.Flags().GetStringSlice("scw-zones")
-	scalewayOptions := &scaleway.ScalewayOptions{
+	scalewayOptions := scaleway.ScalewayOptions{
 		TagName:       getCmdString(cmd, "tag-name"),
 		DryRun:        dryRun,
 		EnableCluster: getCmdBool(cmd, "enable-cluster"),
@@ -87,7 +87,7 @@ func startScaleway(cmd *cobra.Command, interval int64, dryRun bool, wg *sync.Wai
 
 func startDO(cmd *cobra.Command, interval int64, dryRun bool, wg *sync.WaitGroup) {
 	regions, _ := cmd.Flags().GetStringSlice("do-regions")
-	DOOptions := &do.DOOptions{
+	DOOptions := do.DOOptions{
 		TagName:       getCmdString(cmd, "tag-name"),
 		DryRun:        dryRun,
 		EnableCluster: getCmdBool(cmd, "enable-cluster"),

pkg/do/bucket_root.go

@@ -16,7 +16,7 @@ type DOBucket struct {
 	ObjectsInfos []minio.ObjectInfo
 }
 
-func DeleteExpiredBuckets(sessions *DOSessions, options *DOOptions) {
+func DeleteExpiredBuckets(sessions DOSessions, options DOOptions) {
 	expiredBuckets := getExpiredBuckets(sessions.Bucket, options.TagName, options.Region)
 
 	count, start := common.ElemToDeleteFormattedInfos("expired bucket", len(expiredBuckets), options.Region)

pkg/do/cluster_root.go

@@ -16,7 +16,7 @@ type DOCluster struct {
 	IsProtected  bool
 }
 
-func DeleteExpiredClusters(sessions *DOSessions, options *DOOptions) {
+func DeleteExpiredClusters(sessions DOSessions, options DOOptions) {
 	expiredClusters, region := getExpiredClusters(sessions.Client, options.TagName, options.Region)
 
 	count, start := common.ElemToDeleteFormattedInfos("expired cluster", len(expiredClusters), region)

pkg/do/db_root.go

@@ -16,7 +16,7 @@ type DODB struct {
 	IsProtected  bool
 }
 
-func DeleteExpiredDatabases(sessions *DOSessions, options *DOOptions) {
+func DeleteExpiredDatabases(sessions DOSessions, options DOOptions) {
 	expiredDatabases := getExpiredDatabases(sessions.Client, options.TagName, options.Region)
 
 	count, start := common.ElemToDeleteFormattedInfos("expired database", len(expiredDatabases), options.Region)

pkg/do/lb_root.go

@@ -16,7 +16,7 @@ type DOLB struct {
 	IsProtected  bool
 }
 
-func DeleteExpiredLBs(sessions *DOSessions, options *DOOptions) {
+func DeleteExpiredLBs(sessions DOSessions, options DOOptions) {
 	expiredLBs, region := getExpiredLBs(sessions.Client, options.TagName, options.Region)
 
 	count, start := common.ElemToDeleteFormattedInfos("expired load balancer", len(expiredLBs), region)

pkg/do/run.go

@@ -24,18 +24,18 @@ type DOSessions struct {
 	Bucket *minio.Client
 }
 
-type funcDeleteExpired func(sessions *DOSessions, options *DOOptions)
+type funcDeleteExpired func(sessions DOSessions, options DOOptions)
 
-func RunPlecoDO(regions []string, interval int64, wg *sync.WaitGroup, options *DOOptions) {
+func RunPlecoDO(regions []string, interval int64, wg *sync.WaitGroup, options DOOptions) {
 	for _, region := range regions {
 		wg.Add(1)
 		go runPlecoInRegion(region, interval, wg, options)
 	}
 }
 
-func runPlecoInRegion(region string, interval int64, wg *sync.WaitGroup, options *DOOptions) {
+func runPlecoInRegion(region string, interval int64, wg *sync.WaitGroup, options DOOptions) {
 	defer wg.Done()
-	sessions := &DOSessions{}
+	sessions := DOSessions{}
 	sessions.Client = CreateSession()
 	options.Region = region
 

pkg/do/volumes_root.go

@@ -15,7 +15,7 @@ type DOVolume struct {
 	CreationDate time.Time
 }
 
-func DeleteExpiredVolumes(sessions *DOSessions, options *DOOptions) {
+func DeleteExpiredVolumes(sessions DOSessions, options DOOptions) {
 	expiredVolumes := getDetachedVolumes(sessions.Client, options.Region)
 
 	count, start := common.ElemToDeleteFormattedInfos(fmt.Sprintf("detached (%d hours delay) volume", volumeTimeout()), len(expiredVolumes), options.Region)

pkg/scaleway/bucket_root.go

@@ -17,7 +17,7 @@ type ScalewatBucket struct {
 	ObjectsInfos []minio.ObjectInfo
 }
 
-func DeleteExpiredBuckets(sessions *ScalewaySessions, options *ScalewayOptions) {
+func DeleteExpiredBuckets(sessions ScalewaySessions, options ScalewayOptions) {
 	expiredBuckets := getExpiredBuckets(sessions.Bucket, options.TagName, options.Region)
 
 	count, start := common.ElemToDeleteFormattedInfos("expired bucket", len(expiredBuckets), string(options.Region))

pkg/scaleway/cluster_root.go

@@ -15,10 +15,10 @@ type ScalewayCluster struct {
 	IsProtected  bool
 }
 
-func DeleteExpiredClusters(sessions *ScalewaySessions, options *ScalewayOptions) {
-	expiredClusters, region := getExpiredClusters(sessions.Cluster, options.TagName)
+func DeleteExpiredClusters(sessions ScalewaySessions, options ScalewayOptions) {
+	expiredClusters, _ := getExpiredClusters(sessions.Cluster, options.TagName)
 
-	count, start := common.ElemToDeleteFormattedInfos("expired cluster", len(expiredClusters), region)
+	count, start := common.ElemToDeleteFormattedInfos("expired cluster", len(expiredClusters), options.Zone, true)
 
 	log.Debug(count)
 
@@ -77,7 +77,7 @@ func getExpiredClusters(clusterAPI *k8s.API, tagName string) ([]ScalewayCluster,
 func deleteCluster(clusterAPI *k8s.API, cluster ScalewayCluster) {
 	_, err := clusterAPI.DeleteCluster(
 		&k8s.DeleteClusterRequest{
-			ClusterID: cluster.ID,
+			ClusterID:               cluster.ID,
 			WithAdditionalResources: true,
 		})
 

pkg/scaleway/cr_root.go

@@ -7,10 +7,10 @@ import (
 	"time"
 )
 
-func DeleteEmptyContainerRegistries(sessions *ScalewaySessions, options *ScalewayOptions) {
-	emptyRegistries, region := getEmptyRegistries(sessions.Namespace)
+func DeleteEmptyContainerRegistries(sessions ScalewaySessions, options ScalewayOptions) {
+	emptyRegistries, _ := getEmptyRegistries(sessions.Namespace)
 
-	count, start := common.ElemToDeleteFormattedInfos("empty Scaleway namespace", len(emptyRegistries), region)
+	count, start := common.ElemToDeleteFormattedInfos("empty Scaleway namespace", len(emptyRegistries), options.Zone, true)
 
 	log.Debug(count)
 

pkg/scaleway/db_root.go

@@ -15,10 +15,10 @@ type ScalewayDB struct {
 	IsProtected  bool
 }
 
-func DeleteExpiredDatabases(sessions *ScalewaySessions, options *ScalewayOptions) {
-	expiredDatabases, region := getExpiredDatabases(sessions.Database, options.TagName)
+func DeleteExpiredDatabases(sessions ScalewaySessions, options ScalewayOptions) {
+	expiredDatabases, _ := getExpiredDatabases(sessions.Database, options.TagName)
 
-	count, start := common.ElemToDeleteFormattedInfos("expired database", len(expiredDatabases), region)
+	count, start := common.ElemToDeleteFormattedInfos("expired database", len(expiredDatabases), options.Zone, true)
 
 	log.Debug(count)