Merge pull request #721 from tailwarden/fix/naming

Fix GCP functions naming & upgrade go mod

Author: mlabouardy

Makefile

@@ -34,7 +34,7 @@ package:
 
 ## test: Run tests.
 test:
-	go test -v ./...
+	go test -v $(go list ./... | grep -v /dashboard/)
 
 ## version: Show version.
 version:

go.mod

@@ -1,6 +1,6 @@
 module github.com/tailwarden/komiser
 
-go 1.18
+go 1.20
 
 require (
 	cloud.google.com/go/bigquery v1.49.0

providers/gcp/bigquery/bigquery.go renamed to providers/gcp/bigquery/tables.go

@@ -13,7 +13,7 @@ import (
 	"google.golang.org/api/option"
 )
 
-func BigQueryTables(ctx context.Context, client providers.ProviderClient) ([]models.Resource, error) {
+func Tables(ctx context.Context, client providers.ProviderClient) ([]models.Resource, error) {
 	resources := make([]models.Resource, 0)
 
 	bqclient, err := bigquery.NewClient(ctx, client.GCPClient.Credentials.ProjectID, option.WithCredentials(client.GCPClient.Credentials))

providers/gcp/certificate/certificate.go renamed to providers/gcp/certificate/certificates.go

@@ -8,6 +8,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/tailwarden/komiser/models"
 	"github.com/tailwarden/komiser/providers"
+	"github.com/tailwarden/komiser/utils"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 
@@ -53,7 +54,7 @@ func Disks(ctx context.Context, client providers.ProviderClient) ([]models.Resou
 				}
 			}
 
-			zone := extractZoneFromURL(disk.GetZone())
+			zone := utils.GcpExtractZoneFromURL(disk.GetZone())
 
 			resources = append(resources, models.Resource{
 				Provider:   "GCP",
@@ -77,4 +78,4 @@ func Disks(ctx context.Context, client providers.ProviderClient) ([]models.Resou
 	}).Info("Fetched resources")
 
 	return resources, nil
-}
+}

providers/gcp/compute/disk.go renamed to providers/gcp/compute/disks.go

@@ -22,11 +22,11 @@ func listOfSupportedServices() []providers.FetchDataFunction {
 		compute.Instances,
 		compute.Disks,
 		storage.Buckets,
-		bigquery.BigQueryTables,
+		bigquery.Tables,
 		certficate.Certificates,
-		iam.IamRoles,
+		iam.Roles,
 		iam.ServiceAccounts,
-		sql.SqlInstances,
+		sql.Instances,
 		redis.Instances,
 		container.Clusters,
 	}

providers/gcp/compute/compute.go renamed to providers/gcp/compute/instances.go

@@ -13,7 +13,7 @@ import (
 	"google.golang.org/api/option"
 )
 
-func IamRoles(ctx context.Context, client providers.ProviderClient) ([]models.Resource, error) {
+func Roles(ctx context.Context, client providers.ProviderClient) ([]models.Resource, error) {
 	resources := make([]models.Resource, 0)
 
 	iamService, err := iam.NewService(ctx, option.WithCredentials(client.GCPClient.Credentials))

providers/gcp/container/container.go renamed to providers/gcp/container/clusters.go

@@ -12,7 +12,7 @@ import (
 	sqladmin "google.golang.org/api/sqladmin/v1beta4"
 )
 
-func SqlInstances(ctx context.Context, client providers.ProviderClient) ([]models.Resource, error) {
+func Instances(ctx context.Context, client providers.ProviderClient) ([]models.Resource, error) {
 	resources := make([]models.Resource, 0)
 
 	instancesClient, err := sqladmin.NewService(ctx, option.WithCredentials(client.GCPClient.Credentials))