Azure support added. (#1)

* Azure support added.

Signed-off-by: viktor-kurchenko <[email protected]>

* Minor fix.

Signed-off-by: viktor-kurchenko <[email protected]>

---------

Signed-off-by: viktor-kurchenko <[email protected]>

Author: viktor-kurchenko

.github/workflows/lint-build.yaml

@@ -1,7 +1,6 @@
 name: Go Lint and Build
 
 on:
-  push:
   pull_request:
 
 jobs:

Makefile

@@ -4,7 +4,7 @@ define PROJECT_HELP_MSG
 Usage:
   make help:\t show this message
   make lint:\t run go linter
-  make compile:\t compile c7n-helper binary
+  make build:\t build c7n-helper binary
 endef
 export PROJECT_HELP_MSG
 
@@ -14,5 +14,5 @@ help:
 lint:
 	golangci-lint run
 
-compile:
+build:
 	go build .

README.md

@@ -23,7 +23,7 @@ $ make lint
 To build `c7n-helper` from source please run the following locally:
 
 ```console
-$ make compile
+$ make build
 ```
 
 ## Usage

cmd/parser.go

@@ -17,7 +17,7 @@ var parserCmd = &cobra.Command{
 var parseType, parseDir, parsePolicy, parseResult *string
 
 func init() {
-	parseType = parserCmd.Flags().StringP("type", "t", "", "Cloud resource type (eks, ec2, gke, gce)")
+	parseType = parserCmd.Flags().StringP("type", "t", "", "Cloud resource type (eks, ec2, gke, gce, arg)")
 	_ = parserCmd.MarkFlagRequired("type")
 	parseDir = parserCmd.Flags().StringP("report-dir", "d", "", "C7N report directory")
 	_ = parserCmd.MarkFlagRequired("report-dir")

pkg/cloud/aws.go renamed to pkg/aws/aws.go

@@ -1,30 +1,25 @@
-package cloud
+package aws
 
 import (
-	"c7n-helper/pkg/converter"
 	"c7n-helper/pkg/dto"
 	"encoding/json"
 	"fmt"
 	"time"
 )
 
-type EKS struct {
-	Name      string    `converter:"name"`
-	CreatedAt time.Time `converter:"createdAt"`
+type eks struct {
+	Name      string    `json:"name"`
+	CreatedAt time.Time `json:"createdAt"`
 }
 
-type EC2 struct {
-	InstanceId   string    `converter:"InstanceId"`
-	LaunchTime   time.Time `converter:"LaunchTime"`
-	InstanceType string    `converter:"InstanceType"`
+type ec2 struct {
+	InstanceId   string    `json:"InstanceId"`
+	LaunchTime   time.Time `json:"LaunchTime"`
+	InstanceType string    `json:"InstanceType"`
 }
 
-func EksFromFile(file string) ([]dto.Resource, error) {
-	content, err := converter.JsonToBytes(file)
-	if err != nil {
-		return nil, err
-	}
-	var clusters []EKS
+func EKS(content []byte) ([]dto.Resource, error) {
+	var clusters []eks
 	if err := json.Unmarshal(content, &clusters); err != nil {
 		return nil, err
 	}
@@ -38,12 +33,8 @@ func EksFromFile(file string) ([]dto.Resource, error) {
 	return result, nil
 }
 
-func Ec2FromFile(file string) ([]dto.Resource, error) {
-	content, err := converter.JsonToBytes(file)
-	if err != nil {
-		return nil, err
-	}
-	var vms []EC2
+func EC2(content []byte) ([]dto.Resource, error) {
+	var vms []ec2
 	if err := json.Unmarshal(content, &vms); err != nil {
 		return nil, err
 	}

pkg/azure/azure.go

@@ -0,0 +1,26 @@
+package azure
+
+import (
+	"c7n-helper/pkg/dto"
+	"encoding/json"
+	"time"
+)
+
+type rg struct {
+	Name string `json:"name"`
+}
+
+func RG(content []byte) ([]dto.Resource, error) {
+	var groups []rg
+	if err := json.Unmarshal(content, &groups); err != nil {
+		return nil, err
+	}
+	result := make([]dto.Resource, 0, len(groups))
+	for _, group := range groups {
+		result = append(result, dto.Resource{
+			Name:    group.Name,
+			Created: time.Now(), //TODO: fix it
+		})
+	}
+	return result, nil
+}

pkg/cloud/gcp.go

@@ -0,0 +1,47 @@
+package gcp
+
+import (
+	"c7n-helper/pkg/dto"
+	"encoding/json"
+	"time"
+)
+
+type gke struct {
+	Name      string    `json:"name"`
+	CreatedAt time.Time `json:"createTime"`
+}
+
+type gce struct {
+	Name       string    `json:"name"`
+	LaunchTime time.Time `json:"creationTimestamp"`
+}
+
+func GKE(content []byte) ([]dto.Resource, error) {
+	var clusters []gke
+	if err := json.Unmarshal(content, &clusters); err != nil {
+		return nil, err
+	}
+	result := make([]dto.Resource, 0, len(clusters))
+	for _, cluster := range clusters {
+		result = append(result, dto.Resource{
+			Name:    cluster.Name,
+			Created: cluster.CreatedAt,
+		})
+	}
+	return result, nil
+}
+
+func GCE(content []byte) ([]dto.Resource, error) {
+	var vms []gce
+	if err := json.Unmarshal(content, &vms); err != nil {
+		return nil, err
+	}
+	result := make([]dto.Resource, 0, len(vms))
+	for _, vm := range vms {
+		result = append(result, dto.Resource{
+			Name:    vm.Name,
+			Created: vm.LaunchTime,
+		})
+	}
+	return result, nil
+}

pkg/converter/json.go

@@ -1,21 +1,25 @@
 package parser
 
 import (
-	"c7n-helper/pkg/cloud"
+	"c7n-helper/pkg/aws"
+	"c7n-helper/pkg/azure"
 	"c7n-helper/pkg/dto"
+	"c7n-helper/pkg/gcp"
 	"encoding/json"
 	"errors"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
 	"strings"
 )
 
-var resourceParsers = map[string]func(file string) ([]dto.Resource, error){
-	"eks": cloud.EksFromFile,
-	"ec2": cloud.Ec2FromFile,
-	"gke": cloud.GkeFromFile,
-	"gce": cloud.GceFromFile,
+var resourceParsers = map[string]func(content []byte) ([]dto.Resource, error){
+	"eks": aws.EKS,
+	"ec2": aws.EC2,
+	"gke": gcp.GKE,
+	"gce": gcp.GCE,
+	"arg": azure.RG,
 }
 
 func Parse(resourceType, c7nDir, policy, outFile string) error {
@@ -83,7 +87,11 @@ func resourcesFromFile(resourceType, file string) ([]dto.Resource, error) {
 	if !ok {
 		return nil, errors.New("unsupported resource type")
 	}
-	return parser(file)
+	content, err := jsonToBytes(file)
+	if err != nil {
+		return nil, err
+	}
+	return parser(content)
 }
 
 func accountsFromMap(accountMap map[string]dto.Account) []dto.Account {
@@ -106,5 +114,15 @@ func persistReport(report dto.PolicyReport, outFile string) error {
 func accountRegion(file string) (string, string) {
 	parts := strings.Split(file, "/")
 	l := len(parts)
+	//TODO: must be improved for Azure & GCP
 	return parts[l-4] /* account */, parts[l-3] /* region */
 }
+
+func jsonToBytes(file string) ([]byte, error) {
+	jsonFile, err := os.Open(file)
+	if err != nil {
+		return nil, err
+	}
+	defer jsonFile.Close()
+	return io.ReadAll(jsonFile)
+}