From 72473644a28fcb9559305748ebc481ba7acd4109 Mon Sep 17 00:00:00 2001 From: Edoardo Rosa <6991986+notdodo@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:27:03 +0200 Subject: [PATCH 1/7] enh: update deps, workflows and dependabot --- .github/dependabot.yml | 34 +++-- .github/workflows/gitleaks.yml | 19 +++ .github/workflows/golanci-lint.yml | 29 ----- .github/workflows/golanci.yml | 89 +++++++++++++ .github/workflows/gosec.yml | 31 ----- .github/workflows/stale-bot.yml | 3 +- connector/services/neo4j/neo4j.go | 58 ++++----- connector/services/neo4j/writer.go | 53 ++++---- docker-compose.yaml | 34 +++-- go.mod | 92 +++++++------- go.sum | 192 ++++++++++++++++------------- tools/filesystem/files/files.go | 3 +- tools/yamler/yamler.go | 4 +- 13 files changed, 378 insertions(+), 263 deletions(-) create mode 100644 .github/workflows/gitleaks.yml delete mode 100644 .github/workflows/golanci-lint.yml create mode 100644 .github/workflows/golanci.yml delete mode 100644 .github/workflows/gosec.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3389a27..9da5185 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,10 +1,28 @@ version: 2 updates: -- package-ecosystem: github-actions - directory: ".github" - schedule: - interval: weekly -- package-ecosystem: "docker" - directory: "/" - schedule: - interval: weekly + - package-ecosystem: gomod + directory: / + schedule: + interval: monthly + time: "12:00" + day: monday + groups: + iamme: + patterns: + - "*" + - package-ecosystem: docker + directory: / + schedule: + interval: monthly + time: "12:00" + day: wednesday + groups: + iamme-docker: + patterns: + - "*" + - package-ecosystem: github-actions + directory: / + schedule: + interval: monthly + time: "12:00" + day: wednesday diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml new file mode 100644 index 0000000..61b90c9 --- /dev/null +++ b/.github/workflows/gitleaks.yml @@ -0,0 +1,19 @@ +name: Gitleaks +on: + pull_request: + +jobs: + gitleaks: + name: gitleaks + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + # v4.1.2 + with: + fetch-depth: 0 + - name: gitleaks + uses: gitleaks/gitleaks-action@e6dab246340401bf53eec993b8f05aebe80ac636 + # v2.3.4 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITLEAKS_VERSION: latest diff --git a/.github/workflows/golanci-lint.yml b/.github/workflows/golanci-lint.yml deleted file mode 100644 index b476e61..0000000 --- a/.github/workflows/golanci-lint.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: golangci-lint -on: - push: - branches: - - master - - dev - paths: - - '**.go' - pull_request: - paths: - - '**.go' -permissions: - contents: read - pull-requests: read - -jobs: - golangci: - name: lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v4 - with: - go-version: 1.19 - - name: golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - version: latest - args: --timeout 200s --skip-dirs="(^|/)assets($|/)" --enable misspell --enable gofmt --enable goimports --enable whitespace diff --git a/.github/workflows/golanci.yml b/.github/workflows/golanci.yml new file mode 100644 index 0000000..87321ef --- /dev/null +++ b/.github/workflows/golanci.yml @@ -0,0 +1,89 @@ +name: Golang CI +on: + push: + branches: + - master + - dev + paths: + - "**.go" + - "go.mod" + - "go.sum" + pull_request: + paths: + - "**.go" + - "go.mod" + - "go.sum" + +concurrency: + group: nuvola-ci-${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: read + pull-requests: read + +jobs: + golangci: + name: lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + # v4.1.2 + with: + fetch-depth: 0 + - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 + # v5.0.0 + with: + go-version: 1.20 + - name: golangci-lint + uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 + # v4.0.0 + with: + version: latest + only-new-issues: true + args: --timeout 300s --exclude-dirs="(^|/)assets($|/)" --enable misspell --enable gofmt --enable goimports --enable whitespace + + gosec: + runs-on: ubuntu-latest + env: + GO111MODULE: on + steps: + - name: Checkout Source + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + # v4.1.2 + with: + fetch-depth: 0 + - name: Run Gosec Security Scanner + # master to fetch latest checks + # kics-scan ignore-line + uses: securego/gosec@26e57d6b340778c2983cd61775bc7e8bb41d002a + # V.2.19.0 + with: + args: "-exclude-dir=assets -no-fail -fmt sarif -out results.sarif ./..." + - name: Upload SARIF file + uses: github/codeql-action/upload-sarif@4b6aa0b07da05d6e43d0e5f9c8596a6532ce1c85 + # v2.15.3 + with: + sarif_file: ./results.sarif + + go-build-and-test: + strategy: + matrix: + platform: [ubuntu-latest, macos-latest, windows-latest] + runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + # v4.1.2 + with: + fetch-depth: 0 + - name: Setup Go + uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 + # v5.0.0 + with: + go-version: 1.20 + - name: Install dependencies + run: go get . + - name: Build + run: go build ./... + - name: Test with the Go CLI + run: go test ./... diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml deleted file mode 100644 index f645c1b..0000000 --- a/.github/workflows/gosec.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Run Gosec -on: - push: - branches: - - master - - dev - paths: - - '**.go' - pull_request: - branches: - - master - paths: - - '**.go' -jobs: - gosec: - runs-on: ubuntu-latest - env: - GO111MODULE: on - steps: - - name: Checkout Source - uses: actions/checkout@v3 - - - name: Run Gosec Security Scanner - uses: securego/gosec@master - with: - args: -exclude-dir=assets -no-fail -fmt sarif -out results.sarif ./... - - - name: Upload SARIF file - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: results.sarif diff --git a/.github/workflows/stale-bot.yml b/.github/workflows/stale-bot.yml index aa3a5c9..706c0f1 100644 --- a/.github/workflows/stale-bot.yml +++ b/.github/workflows/stale-bot.yml @@ -7,7 +7,8 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v6 + - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e + # v9.0.0 with: stale-issue-message: "This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 5 days." close-issue-message: "This issue was closed because it has been stalled for 5 days with no activity." diff --git a/connector/services/neo4j/neo4j.go b/connector/services/neo4j/neo4j.go index a5ee6b7..10c4375 100644 --- a/connector/services/neo4j/neo4j.go +++ b/connector/services/neo4j/neo4j.go @@ -10,6 +10,7 @@ import ( "github.com/neo4j/neo4j-go-driver/v5/neo4j" "github.com/neo4j/neo4j-go-driver/v5/neo4j/config" "github.com/neo4j/neo4j-go-driver/v5/neo4j/dbtype" + "github.com/neo4j/neo4j-go-driver/v5/neo4j/log" ) type Neo4jClient struct { @@ -17,11 +18,11 @@ type Neo4jClient struct { err error } -var logLevel = neo4j.LogLevel(neo4j.WARNING) +var logLevel = log.Level(log.WARNING) -var useConsoleLogger = func(level neo4j.LogLevel) func(config *config.Config) { +var useConsoleLogger = func(level log.Level) func(config *config.Config) { return func(config *config.Config) { - config.Log = neo4j.ConsoleLogger(level) + config.Log = log.ToConsole(level) } } @@ -42,48 +43,47 @@ func (nc *Neo4jClient) NewSession() neo4j.SessionWithContext { AccessMode: neo4j.AccessModeWrite}) } -/* #nosec */ //nolint:all func (nc *Neo4jClient) DeleteAll() { session := nc.NewSession() defer session.Close(context.TODO()) - session.Run(context.TODO(), `call apoc.periodic.commit("MATCH (n) WITH n LIMIT $limit DETACH DELETE n RETURN count(*)", {limit:20000})`, nil) - session.Run(context.TODO(), "CALL apoc.schema.assert({},{})", nil) - session.Run(context.TODO(), "CALL apoc.trigger.removeAll()", nil) + session.Run(context.TODO(), `call apoc.periodic.commit("MATCH (n) WITH n LIMIT $limit DETACH DELETE n RETURN count(*)", {limit:20000})`, nil) // #nosec G104 + session.Run(context.TODO(), "CALL apoc.schema.assert({},{})", nil) // #nosec G104 + session.Run(context.TODO(), "CALL apoc.trigger.removeAll()", nil) // #nosec G104 // UNIQUE also create an index - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (u:User) ASSERT u.Arn IS UNIQUE", nil) - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (r:Role) ASSERT r.Arn IS UNIQUE", nil) - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (g:Group) ASSERT g.Arn IS UNIQUE", nil) - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (e:Ec2) ASSERT e.InstanceId IS UNIQUE", nil) - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (b:S3) ASSERT b.Name IS UNIQUE", nil) - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (l:Lambda) ASSERT l.FunctionConfiguration_FunctionArn IS UNIQUE", nil) - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (v:Vpc) ASSERT v.VpcId IS UNIQUE", nil) - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (r:Redshift) ASSERT r.ClusterIdentifier IS UNIQUE", nil) - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (d:Dynamodb) ASSERT d.Name IS UNIQUE", nil) - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (r:Rds) ASSERT r.DBClusterArn IS UNIQUE", nil) - session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (r:Rds) ASSERT r.DBInstanceArn IS UNIQUE", nil) + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (u:User) ASSERT u.Arn IS UNIQUE", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (r:Role) ASSERT r.Arn IS UNIQUE", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (g:Group) ASSERT g.Arn IS UNIQUE", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (e:Ec2) ASSERT e.InstanceId IS UNIQUE", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (b:S3) ASSERT b.Name IS UNIQUE", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (l:Lambda) ASSERT l.FunctionArn IS UNIQUE", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (v:Vpc) ASSERT v.VpcId IS UNIQUE", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (r:Redshift) ASSERT r.ClusterIdentifier IS UNIQUE", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (d:Dynamodb) ASSERT d.Name IS UNIQUE", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (r:Rds) ASSERT r.DBClusterArn IS UNIQUE", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE CONSTRAINT IF NOT EXISTS ON (r:Rds) ASSERT r.DBInstanceArn IS UNIQUE", nil) // #nosec G104 - session.Run(context.TODO(), "CREATE INDEX index_User IF NOT EXISTS FOR (u:User) ON u.UserName", nil) + session.Run(context.TODO(), "CREATE INDEX index_User IF NOT EXISTS FOR (u:User) ON u.UserName", nil) // #nosec G104 - session.Run(context.TODO(), "CREATE INDEX index_Role IF NOT EXISTS FOR (r:Role) ON r.RoleName", nil) - session.Run(context.TODO(), "CREATE INDEX index_RoleInstanceProfileArn IF NOT EXISTS FOR (r:Role) ON r.InstanceProfileArn", nil) + session.Run(context.TODO(), "CREATE INDEX index_Role IF NOT EXISTS FOR (r:Role) ON r.RoleName", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE INDEX index_RoleInstanceProfileArn IF NOT EXISTS FOR (r:Role) ON r.InstanceProfileArn", nil) // #nosec G104 - session.Run(context.TODO(), "CREATE INDEX index_Group IF NOT EXISTS FOR (g:Group) ON g.GroupName", nil) + session.Run(context.TODO(), "CREATE INDEX index_Group IF NOT EXISTS FOR (g:Group) ON g.GroupName", nil) // #nosec G104 - session.Run(context.TODO(), "CREATE INDEX index_Policy IF NOT EXISTS FOR (p:Policy) ON p.Name", nil) + session.Run(context.TODO(), "CREATE INDEX index_Policy IF NOT EXISTS FOR (p:Policy) ON p.Name", nil) // #nosec G104 - session.Run(context.TODO(), "CREATE INDEX index_Action IF NOT EXISTS FOR (n:Action) ON n.Action", nil) + session.Run(context.TODO(), "CREATE INDEX index_Action IF NOT EXISTS FOR (n:Action) ON n.Action", nil) // #nosec G104 - session.Run(context.TODO(), "CREATE INDEX index_EC2InstanceProfiles IF NOT EXISTS FOR (e:Ec2) ON e.IamInstanceProfile_Id", nil) + session.Run(context.TODO(), "CREATE INDEX index_EC2InstanceProfiles IF NOT EXISTS FOR (e:Ec2) ON e.IamInstanceProfile_Id", nil) // #nosec G104 - session.Run(context.TODO(), "CREATE INDEX index_VpcOwner IF NOT EXISTS FOR (v:Vpc) ON v.OwnerId", nil) - session.Run(context.TODO(), "CREATE INDEX index_VpcType IF NOT EXISTS FOR (v:Vpc) ON v.Type", nil) + session.Run(context.TODO(), "CREATE INDEX index_VpcOwner IF NOT EXISTS FOR (v:Vpc) ON v.OwnerId", nil) // #nosec G104 + session.Run(context.TODO(), "CREATE INDEX index_VpcType IF NOT EXISTS FOR (v:Vpc) ON v.Type", nil) // #nosec G104 - session.Run(context.TODO(), "CREATE INDEX index_LambdaRole IF NOT EXISTS FOR (l:Lambda) ON l.Role", nil) + session.Run(context.TODO(), "CREATE INDEX index_LambdaRole IF NOT EXISTS FOR (l:Lambda) ON l.Role", nil) // #nosec G104 - session.Run(context.TODO(), "CALL db.awaitIndexes(3000)", nil) + session.Run(context.TODO(), "CALL db.awaitIndexes(3000)", nil) // #nosec G104 } func (nc *Neo4jClient) Query(query string, arguments map[string]interface{}) []map[string]interface{} { diff --git a/connector/services/neo4j/writer.go b/connector/services/neo4j/writer.go index a35dfc2..9bd023e 100644 --- a/connector/services/neo4j/writer.go +++ b/connector/services/neo4j/writer.go @@ -2,7 +2,9 @@ package neo4j_connector import ( "context" + "encoding/json" "fmt" + "log" awsconfig "nuvola/connector/services/aws" servicesDatabase "nuvola/connector/services/aws/database" servicesEC2 "nuvola/connector/services/aws/ec2" @@ -20,51 +22,54 @@ import ( ) func (nc *Neo4jClient) AddUsers(users *[]servicesIAM.User) { - for i := range *users { - idUser := nc.createUser(&(*users)[i]) - for _, inlinePolicy := range (*users)[i].InlinePolicies { + for _, user := range *users { + idUser := nc.createUser(user) + for _, inlinePolicy := range user.InlinePolicies { idPolicy := nc.createPolicyUser(idUser, "", inlinePolicy.PolicyName, "inline") - nc.createPolicyRelationships(idPolicy, &inlinePolicy.Statement, *(*users)[i].UserName) + pol := inlinePolicy + nc.createPolicyRelationships(idPolicy, &pol.Statement, *user.UserName) } - for _, attachedPolicy := range (*users)[i].AttachedPolicies { + for _, attachedPolicy := range user.AttachedPolicies { idPolicy := nc.createPolicyUser(idUser, *attachedPolicy.PolicyArn, *attachedPolicy.PolicyName, "attached") - nc.createPolicyRelationships(idPolicy, &attachedPolicy.Versions[0].Document.Statement, *(*users)[i].UserName) + nc.createPolicyRelationships(idPolicy, &attachedPolicy.Versions[0].Document.Statement, *user.UserName) } } } func (nc *Neo4jClient) AddGroups(groups *[]servicesIAM.Group) { - for i := range *groups { - idGroup := nc.createGroup(&(*groups)[i]) - for _, inlinePolicy := range (*groups)[i].InlinePolicies { + for _, group := range *groups { + idGroup := nc.createGroup(group) + for _, inlinePolicy := range group.InlinePolicies { idPolicy := nc.createPolicyGroup(idGroup, "", inlinePolicy.PolicyName, "inline") - nc.createPolicyRelationships(idPolicy, &inlinePolicy.Statement, *(*groups)[i].GroupName) + pol := inlinePolicy + nc.createPolicyRelationships(idPolicy, &pol.Statement, *group.GroupName) } - for _, attachedPolicy := range (*groups)[i].AttachedPolicies { + for _, attachedPolicy := range group.AttachedPolicies { idPolicy := nc.createPolicyGroup(idGroup, *attachedPolicy.PolicyArn, *attachedPolicy.PolicyName, "attached") - nc.createPolicyRelationships(idPolicy, &attachedPolicy.Versions[0].Document.Statement, *(*groups)[i].GroupName) + nc.createPolicyRelationships(idPolicy, &attachedPolicy.Versions[0].Document.Statement, *group.GroupName) } } } func (nc *Neo4jClient) AddRoles(roles *[]servicesIAM.Role) { - for i := range *roles { - idRole := nc.createRole(&(*roles)[i]) - for _, inlinePolicy := range (*roles)[i].InlinePolicies { + for _, role := range *roles { + idRole := nc.createRole(role) + for _, inlinePolicy := range role.InlinePolicies { idPolicy := nc.createPolicyRole(idRole, "", inlinePolicy.PolicyName, "inline") - nc.createPolicyRelationships(idPolicy, &inlinePolicy.Statement, *(*roles)[i].RoleName) + pol := inlinePolicy + nc.createPolicyRelationships(idPolicy, &pol.Statement, *role.RoleName) } - for _, attachedPolicy := range (*roles)[i].AttachedPolicies { + for _, attachedPolicy := range role.AttachedPolicies { idPolicy := nc.createPolicyRole(idRole, *attachedPolicy.PolicyArn, *attachedPolicy.PolicyName, "attached") - nc.createPolicyRelationships(idPolicy, &attachedPolicy.Versions[0].Document.Statement, *(*roles)[i].RoleName) + nc.createPolicyRelationships(idPolicy, &attachedPolicy.Versions[0].Document.Statement, *role.RoleName) } } } -func (nc *Neo4jClient) createGroup(group *servicesIAM.Group) int64 { +func (nc *Neo4jClient) createGroup(group servicesIAM.Group) int64 { session := nc.NewSession() defer session.Close(context.TODO()) query := `MERGE (g:IAM:Group {GroupName: $GroupName, CreateDate: $CreateDate, Arn: $Arn, Path: $Path, GroupId: $GroupId}) RETURN id(g)` @@ -129,7 +134,7 @@ func (nc *Neo4jClient) createPolicyGroup(idGroup int64, policyArn string, name s return idPolicy.(int64) } -func (nc *Neo4jClient) createUser(user *servicesIAM.User) int64 { +func (nc *Neo4jClient) createUser(user servicesIAM.User) int64 { groupNames := make([]string, 0) query := `MERGE (u:IAM:User { UserName: $UserName, @@ -237,7 +242,7 @@ func (nc *Neo4jClient) createPolicyUser(idUser int64, policyArn string, name str return idPolicy.(int64) } -func (nc *Neo4jClient) createRole(role *servicesIAM.Role) int64 { +func (nc *Neo4jClient) createRole(role servicesIAM.Role) int64 { session := nc.NewSession() defer session.Close(context.TODO()) query := "" @@ -314,6 +319,12 @@ func (nc *Neo4jClient) AddObjects(result map[string]interface{}, query string) { session := nc.NewSession() defer session.Close(context.TODO()) + b, e := json.Marshal(result) + if e != nil { + log.Fatal(e) + } + fmt.Println(string(b)) + _, err := session.ExecuteWrite(context.TODO(), func(tx neo4j.ManagedTransaction) (any, error) { var result, err = tx.Run(context.TODO(), query, result) diff --git a/docker-compose.yaml b/docker-compose.yaml index ab0ae29..8dc9a39 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,23 +5,39 @@ services: image: neo4j:latest hostname: neo4j container_name: neo4j + networks: + - nuvola + cap_drop: + - ALL + cap_add: + - CAP_CHOWN + - CAP_FOWNER + - CAP_DAC_OVERRIDE + - CAP_SETGID + - CAP_SETUID ports: - - "7474:7474" - - "7687:7687" + - "127.0.0.1:7474:7474" + - "0.0.0.0:7687:7687" volumes: - - logs:/logs/ - - nuvoladb:/data - ./backup:/backup:rw environment: NEO4J_PLUGINS: '["apoc"]' NEO4J_AUTH: $NEO4J_AUTH + NEO4J_apoc_export_file_enabled: "true" NEO4J_server_memory_heap_initial__size: ${NEO4J_server_memory_heap_initial__size} NEO4J_server_memory_heap_max__size: ${NEO4J_server_memory_heap_max__size} NEO4J_server_memory_pagecache_size: ${NEO4J_server_memory_pagecache_size} - NEO4J_server_jvm_additional: "-XX:+ExitOnOutOfMemoryError" - NEO4J_initial_dbms_default__database: "nuvoladb" + NEO4J_server_jvm_additional: -XX:+ExitOnOutOfMemoryError + NEO4J_initial_dbms_default__database: nuvoladb NEO4J_dbms_cypher_forbid__shortestpath__common__nodes: "false" + security_opt: + - no-new-privileges:true + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:7474"] + interval: 5m + timeout: 10s + retries: 3 + start_period: 1m -volumes: - nuvoladb: - logs: +networks: + nuvola: diff --git a/go.mod b/go.mod index 00e23f6..e037362 100644 --- a/go.mod +++ b/go.mod @@ -1,66 +1,72 @@ module nuvola -go 1.18 +go 1.21 + +toolchain go1.21.6 require ( - github.com/aws/aws-sdk-go-v2 v1.18.0 - github.com/aws/aws-sdk-go-v2/config v1.18.25 - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.12 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0 - github.com/aws/aws-sdk-go-v2/service/iam v1.19.12 - github.com/aws/aws-sdk-go-v2/service/lambda v1.35.0 - github.com/aws/aws-sdk-go-v2/service/rds v1.45.0 - github.com/aws/aws-sdk-go-v2/service/redshift v1.27.11 - github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1 - github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 - github.com/fatih/color v1.15.0 - github.com/gocarina/gocsv v0.0.0-20230513223533-9ddd7fd60602 - github.com/imroc/req/v3 v3.35.1 - github.com/itchyny/gojq v0.12.13 + github.com/aws/aws-sdk-go-v2 v1.26.1 + github.com/aws/aws-sdk-go-v2/config v1.27.11 + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.29.1 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.31.1 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.156.0 + github.com/aws/aws-sdk-go-v2/service/iam v1.32.0 + github.com/aws/aws-sdk-go-v2/service/lambda v1.54.0 + github.com/aws/aws-sdk-go-v2/service/rds v1.77.1 + github.com/aws/aws-sdk-go-v2/service/redshift v1.44.0 + github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 + github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 + github.com/fatih/color v1.16.0 + github.com/gocarina/gocsv v0.0.0-20231116093920-b87c2d0e983a + github.com/imroc/req/v3 v3.43.2 + github.com/itchyny/gojq v0.12.15 github.com/joho/godotenv v1.5.1 - github.com/neo4j/neo4j-go-driver/v5 v5.9.0 + github.com/neo4j/neo4j-go-driver/v5 v5.19.0 github.com/notdodo/arner v0.0.0-20230222134658-4fe417a6cc9c github.com/notdodo/goflat v0.0.0-20220904193052-d6f007cccdea - github.com/ohler55/ojg v1.18.7 - golang.org/x/sync v0.2.0 + github.com/ohler55/ojg v1.21.5 + golang.org/x/sync v0.7.0 golang.org/x/text v0.14.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect - github.com/aws/smithy-go v1.13.5 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect + github.com/aws/smithy-go v1.20.2 // indirect + github.com/cloudflare/circl v1.3.7 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect - github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect + github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/itchyny/timefmt-go v0.1.5 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/klauspost/compress v1.17.8 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect - github.com/onsi/ginkgo/v2 v2.9.7 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/onsi/ginkgo/v2 v2.17.1 // indirect github.com/quic-go/qpack v0.4.0 // indirect github.com/quic-go/quic-go v0.42.0 // indirect + github.com/refraction-networking/utls v1.6.4 // indirect go.uber.org/mock v0.4.0 // indirect - golang.org/x/crypto v0.17.0 // indirect - golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect - golang.org/x/mod v0.11.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/sys v0.15.0 // indirect - golang.org/x/tools v0.9.3 // indirect + golang.org/x/crypto v0.22.0 // indirect + golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/tools v0.20.0 // indirect ) diff --git a/go.sum b/go.sum index a9b9486..31ffccb 100644 --- a/go.sum +++ b/go.sum @@ -1,80 +1,86 @@ -github.com/aws/aws-sdk-go-v2 v1.18.0 h1:882kkTpSFhdgYRKVZ/VCgf7sd0ru57p2JCxz4/oN5RY= -github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.18.25 h1:JuYyZcnMPBiFqn87L2cRppo+rNwgah6YwD3VuyvaW6Q= -github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4= -github.com/aws/aws-sdk-go-v2/credentials v1.13.24 h1:PjiYyls3QdCrzqUN35jMWtUK1vqVZ+zLfdOa/UPFDp0= -github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 h1:jJPgroehGvjrde3XufFIJUZVK5A2L9a3KwSFgKy9n8w= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 h1:kG5eQilShqmJbv11XL1VpyDbaEJzWxd4zRiCG30GSn4= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 h1:vFQlirhuM8lLlpI7imKOMsjdQLuN9CPi+k44F/OFVsk= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 h1:gGLG7yKaXG02/jBlg210R7VgQIotiQntNhsCFejawx8= -github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25 h1:AzwRi5OKKwo4QNqPf7TjeO+tK8AyOK3GVSwmRPo7/Cs= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.25/go.mod h1:SUbB4wcbSEyCvqBxv/O/IBf93RbEze7U7OnoTlpPB+g= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.12 h1:4jgaIiXEPwMogu89ah7MGeYZA8niMwH3KxymzSpAIkw= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.12/go.mod h1:05NIzmwCjR1k1Hhx3RPSkKFRdO9AyHuEJCEgTZG8Ta4= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7 h1:yb2o8oh3Y+Gg2g+wlzrWS3pB89+dHrXayT/d9cs8McU= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.19.7/go.mod h1:1MNss6sqoIsFGisX92do/5doiUCBrN7EjhZCS/8DUjI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0 h1:NXi4pNJWjAaiI56P1Rl8DC9A4jMNRE00WNBsDua5WRg= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0/go.mod h1:L3ZT0N/vBsw77mOAawXmRnREpEjcHd2v5Hzf7AkIH8M= -github.com/aws/aws-sdk-go-v2/service/iam v1.19.12 h1:JH1H7POlsZt41X9JYIBLZoXW0Qv+WOuC48xsafsls2Q= -github.com/aws/aws-sdk-go-v2/service/iam v1.19.12/go.mod h1:kAnokExGCYs7zfvZEZdFHvQ/x4ZKIci0Raps6mZI1Ag= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11/go.mod h1:iV4q2hsqtNECrfmlXyord9u4zyuFEJX9eLgLpSPzWA8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28 h1:vGWm5vTpMr39tEZfQeDiDAMgk+5qsnvRny3FjLpnH5w= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.28/go.mod h1:spfrICMD6wCAhjhzHuy6DOZZ+LAIY10UxhUmLzpJTTs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27 h1:QmyPCRZNMR1pFbiOi9kBZWZuKrKB9LD4cxltxQk4tNE= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.27/go.mod h1:DfuVY36ixXnsG+uTqnoLWunXAKJ4qjccoFrXUPpj+hs= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 h1:0iKliEXAcCa2qVtRs7Ot5hItA2MsufrphbRFlz1Owxo= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2 h1:NbWkRxEEIRSCqxhsHQuMiTH7yo+JZW1gp8v3elSVMTQ= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2/go.mod h1:4tfW5l4IAB32VWCDEBxCRtR9T4BWy4I4kr1spr8NgZM= -github.com/aws/aws-sdk-go-v2/service/lambda v1.35.0 h1:iNLsDIOju/bbqw0mNaEXh+9Ms6Mm0RjcHPP9z4k9lUY= -github.com/aws/aws-sdk-go-v2/service/lambda v1.35.0/go.mod h1:i23nHcGEyswthctBfhEO1agGpM5Uyh83aSmSB6DmdCk= -github.com/aws/aws-sdk-go-v2/service/rds v1.45.0 h1:Yi23UNiGidNfT7tIW0lbE6JtRR1ZN+cNZGRTKLB+opk= -github.com/aws/aws-sdk-go-v2/service/rds v1.45.0/go.mod h1:rS6T0DrjdZ5LDr8ZC/J9iZdD1oSbie5reWWzqv5zLOw= -github.com/aws/aws-sdk-go-v2/service/redshift v1.27.11 h1:a6XfWSH3xO0+eEAT9ox6V13LNX09fQrs7QvU5+juxY0= -github.com/aws/aws-sdk-go-v2/service/redshift v1.27.11/go.mod h1:gEfU7N8/eImCoodwl5CKW7Mih19THtJhzQCdA5TZZQ0= -github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1 h1:O+9nAy9Bb6bJFTpeNFtd9UfHbgxO1o4ZDAM9rQp5NsY= -github.com/aws/aws-sdk-go-v2/service/s3 v1.33.1/go.mod h1:J9kLNzEiHSeGMyN7238EjJmBpCniVzFda75Gxl/NqB8= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 h1:UBQjaMTCKwyUYwiVnUt6toEJwGXsLBI6al083tpjJzY= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 h1:PkHIIJs8qvq0e5QybnZoG1K/9QTrLr9OsqCIo59jOBA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk= -github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 h1:2DQLAKDteoEDI8zpCzqBMaZlJuoE9iTYD0gFmXVax9E= -github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8= -github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= -github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= +github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= +github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg= +github.com/aws/aws-sdk-go-v2/config v1.27.11 h1:f47rANd2LQEYHda2ddSCKYId18/8BhSRM4BULGmfgNA= +github.com/aws/aws-sdk-go-v2/config v1.27.11/go.mod h1:SMsV78RIOYdve1vf36z8LmnszlRWkwMQtomCAI0/mIE= +github.com/aws/aws-sdk-go-v2/credentials v1.17.11 h1:YuIB1dJNf1Re822rriUOTxopaHHvIq0l/pX3fwO+Tzs= +github.com/aws/aws-sdk-go-v2/credentials v1.17.11/go.mod h1:AQtFPsDH9bI2O+71anW6EKL+NcD7LG3dpKGMV4SShgo= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 h1:FVJ0r5XTHSmIHJV6KuDmdYhEpvlHpiSd38RQWhut5J4= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1/go.mod h1:zusuAeqezXzAB24LGuzuekqMAEgWkVYukBec3kr3jUg= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 h1:aw39xVGeRWlWx9EzGVnhOR4yOjQDHPQ6o6NmBlscyQg= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5/go.mod h1:FSaRudD0dXiMPK2UjknVwwTYyZMRsHv3TtkabsZih5I= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 h1:PG1F3OD1szkuQPzDw3CIQsRIrtTlUC3lP84taWzHlq0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5/go.mod h1:jU1li6RFryMz+so64PpKtudI+QzbKoIEivqdf6LNpOc= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 h1:81KE7vaZzrl7yHBYHVEzYB8sypz11NMOZ40YlWvPxsU= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5/go.mod h1:LIt2rg7Mcgn09Ygbdh/RdIm0rQ+3BNkbP1gyVMFtRK0= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.29.1 h1:PL5AbOt4fBuqFOupjlJz7FNQv8Y9iq/3AlOiPFMcBhY= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.29.1/go.mod h1:CDDc+pehLZpaGJNHUE6RJcp7MjQUhduISa1bQ/ixwR8= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.31.1 h1:dZXY07Dm59TxAjJcUfNMJHLDI/gLMxTRZefn2jFAVsw= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.31.1/go.mod h1:lVLqEtX+ezgtfalyJs7Peb0uv9dEpAQP5yuq2O26R44= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.156.0 h1:TFK9GeUINErClL2+A+GLYhjiChVdaXCgIUiCsS/UQrE= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.156.0/go.mod h1:xejKuuRDjz6z5OqyeLsz01MlOqqW7CqpAB4PabNvpu8= +github.com/aws/aws-sdk-go-v2/service/iam v1.32.0 h1:ZNlfPdw849gBo/lvLFbEEvpTJMij0LXqiNWZ+lIamlU= +github.com/aws/aws-sdk-go-v2/service/iam v1.32.0/go.mod h1:aXWImQV0uTW35LM0A/T4wEg6R1/ReXUu4SM6/lUHYK0= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 h1:Ji0DY1xUsUr3I8cHps0G+XM3WWU16lP6yG8qu1GAZAs= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2/go.mod h1:5CsjAbs3NlGQyZNFACh+zztPDI7fU6eW9QsxjfnuBKg= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 h1:ZMeFZ5yk+Ek+jNr1+uwCd2tG89t6oTS5yVWpa6yy2es= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7/go.mod h1:mxV05U+4JiHqIpGqqYXOHLPKUC6bDXC44bsUhNjOEwY= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.6 h1:6tayEze2Y+hiL3kdnEUxSPsP+pJsUfwLSFspFl1ru9Q= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.6/go.mod h1:qVNb/9IOVsLCZh0x2lnagrBwQ9fxajUpXS7OZfIsKn0= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 h1:ogRAwT1/gxJBcSWDMZlgyFUM962F51A5CRhDLbxLdmo= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7/go.mod h1:YCsIZhXfRPLFFCl5xxY+1T9RKzOKjCut+28JSX2DnAk= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 h1:f9RyWNtS8oH7cZlbn+/JNPpjUk5+5fLd5lM9M0i49Ys= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5/go.mod h1:h5CoMZV2VF297/VLhRhO1WF+XYWOzXo+4HsObA4HjBQ= +github.com/aws/aws-sdk-go-v2/service/lambda v1.54.0 h1:gazALVrZ7RIG6gJXut3c7NKtPgs9eQ8BFCA9uoliayk= +github.com/aws/aws-sdk-go-v2/service/lambda v1.54.0/go.mod h1:rFAo+jemFgeqYzDbbCbz2QWQs1Fnk1meTUK9fWkED9M= +github.com/aws/aws-sdk-go-v2/service/rds v1.77.1 h1:RatrfyDgfeXDmYw1gq5IR5tXXf1C9/enPtXWXn5kufE= +github.com/aws/aws-sdk-go-v2/service/rds v1.77.1/go.mod h1:Rw15qGaGWu3jO0dOz7JyvdOEjgae//YrJxVWLYGynvg= +github.com/aws/aws-sdk-go-v2/service/redshift v1.44.0 h1:j18lTPPqe+qlapn1R8//+ujvXdplku8V41xzBNNLtn0= +github.com/aws/aws-sdk-go-v2/service/redshift v1.44.0/go.mod h1:8ldsMsikORLj0GZUozSvbQdctrumAPYhizmj/3AAATI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 h1:6cnno47Me9bRykw9AEv9zkXE+5or7jz8TsskTTccbgc= +github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1/go.mod h1:qmdkIIAC+GCLASF7R2whgNrJADz0QZPX+Seiw/i4S3o= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 h1:vN8hEbpRnL7+Hopy9dzmRle1xmDc7o8tmY0klsr175w= +github.com/aws/aws-sdk-go-v2/service/sso v1.20.5/go.mod h1:qGzynb/msuZIE8I75DVRCUXw3o3ZyBmUvMwQ2t/BrGM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 h1:Jux+gDDyi1Lruk+KHF91tK2KCuY61kzoCpvtvJJBtOE= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4/go.mod h1:mUYPBhaF2lGiukDEjJX2BLRRKTmoUSitGDUgM4tRxak= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 h1:cwIxeBttqPN3qkaAjcEcsh8NYr8n2HZPkcKgPAi1phU= +github.com/aws/aws-sdk-go-v2/service/sts v1.28.6/go.mod h1:FZf1/nKNEkHdGGJP/cI2MoIMquumuRK6ol3QQJNDxmw= +github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= +github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= +github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= +github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= -github.com/gocarina/gocsv v0.0.0-20230513223533-9ddd7fd60602 h1:HSpPf+lPYwzoJNup34uegmOQk5Qm83S+wpu8anTDJkg= -github.com/gocarina/gocsv v0.0.0-20230513223533-9ddd7fd60602/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI= +github.com/gocarina/gocsv v0.0.0-20231116093920-b87c2d0e983a h1:RYfmiM0zluBJOiPDJseKLEN4BapJ42uSi9SZBQ2YyiA= +github.com/gocarina/gocsv v0.0.0-20231116093920-b87c2d0e983a/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9SN1TigNLn9ZnF3W4SYRKq2gAHs= -github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo= +github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/imroc/req/v3 v3.35.1 h1:xrsuKq4FHWqxU2DM8lWbTwmxiObGfR7B/zgEBMmy8Wc= -github.com/imroc/req/v3 v3.35.1/go.mod h1:c8dXW9N3SJn/DuKVjHHmryV2WO7At9bFtnu1rloiFoo= -github.com/itchyny/gojq v0.12.13 h1:IxyYlHYIlspQHHTE0f3cJF0NKDMfajxViuhBLnHd/QU= -github.com/itchyny/gojq v0.12.13/go.mod h1:JzwzAqenfhrPUuwbmEz3nu3JQmFLlQTQMUcOdnu/Sf4= +github.com/imroc/req/v3 v3.43.2 h1:xkm4vjhKC1wUWxDM6TRdQfkj31lHnLDAlZJgxeQK8bI= +github.com/imroc/req/v3 v3.43.2/go.mod h1:SQIz5iYop16MJxbo8ib+4LnostGCok8NQf8ToyQc2xA= +github.com/itchyny/gojq v0.12.15 h1:WC1Nxbx4Ifw5U2oQWACYz32JK8G9qxNtHzrvW4KEcqI= +github.com/itchyny/gojq v0.12.15/go.mod h1:uWAHCbCIla1jiNxmeT5/B5mOjSdfkCq6p8vxWg+BM10= github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE= github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -83,6 +89,8 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -90,19 +98,20 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/neo4j/neo4j-go-driver/v5 v5.9.0 h1:TYxT0RSiwnvVFia90V7TLnRXv8HkdQQ6rTUaPVoyZ+w= -github.com/neo4j/neo4j-go-driver/v5 v5.9.0/go.mod h1:Vff8OwT7QpLm7L2yYr85XNWe9Rbqlbeb9asNXJTHO4k= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/neo4j/neo4j-go-driver/v5 v5.19.0 h1:v2cB19fZQYz1xmj6EZXofFHD/+Tj16hH/OOp39uNN1I= +github.com/neo4j/neo4j-go-driver/v5 v5.19.0/go.mod h1:Vff8OwT7QpLm7L2yYr85XNWe9Rbqlbeb9asNXJTHO4k= github.com/notdodo/arner v0.0.0-20230222134658-4fe417a6cc9c h1:37kqfvmX/HFliADVjlWnDKX5af1taKSsm6Ii0MqPMuM= github.com/notdodo/arner v0.0.0-20230222134658-4fe417a6cc9c/go.mod h1:5iOlJjvEyWqP/mkg03kfzT1zvX/yuIPNgcD6fkPUT1Y= github.com/notdodo/goflat v0.0.0-20220904193052-d6f007cccdea h1:TTEzxjv1dP0Jii9umTZtcHQmbbHTDVuqfDz7GsUPrfQ= github.com/notdodo/goflat v0.0.0-20220904193052-d6f007cccdea/go.mod h1:BdpTBkDzO80DRo6AKBszQJYfkHnMj2iB804PIK1m2Qw= -github.com/ohler55/ojg v1.18.7 h1:sC7zy0usEiWa6bvx3NU1yZH4kCA2F3Qzs6iiDX4+xdk= -github.com/ohler55/ojg v1.18.7/go.mod h1:uHcD1ErbErC27Zhb5Df2jUjbseLLcmOCo6oxSr3jZxo= -github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss= -github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0= -github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= +github.com/ohler55/ojg v1.21.5 h1:Wfok9bfUImPFe3v6W61+Kz0j3fcjBt0NDVIpOtHAczQ= +github.com/ohler55/ojg v1.21.5/go.mod h1:gQhDVpQLqrmnd2eqGAvJtn+NfKoYJbe/A4Sj3/Vro4o= +github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= +github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= +github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -111,6 +120,9 @@ github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1 github.com/quic-go/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM= github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M= github.com/r3labs/diff v1.1.0 h1:V53xhrbTHrWFWq3gI4b94AjgEJOerO1+1l0xyHOBi8M= +github.com/r3labs/diff v1.1.0/go.mod h1:7WjXasNzi0vJetRcB/RqNl5dlIsmXcTTLmF5IoH6Xig= +github.com/refraction-networking/utls v1.6.4 h1:aeynTroaYn7y+mFtqv8D0bQ4bw0y9nJHneGxJ7lvRDM= +github.com/refraction-networking/utls v1.6.4/go.mod h1:2VL2xfiqgFAZtJKeUTlf+PSYFs3Eu7km0gCtXJ3m8zs= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -118,30 +130,34 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= -golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 h1:ESSUROHIBHg7USnszlcdmjBEwdMj9VUvU+OPk4yl2mc= +golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= -golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/tools/filesystem/files/files.go b/tools/filesystem/files/files.go index b20aa9e..867c365 100644 --- a/tools/filesystem/files/files.go +++ b/tools/filesystem/files/files.go @@ -2,7 +2,6 @@ package files import ( "io/fs" - "io/ioutil" cli "nuvola/tools/cli/output" nuvolaerror "nuvola/tools/error" "os" @@ -18,7 +17,7 @@ func PrettyJSONToFile(filePath string, fileName string, s interface{}) { } filePath = filePath + string(filepath.Separator) + fileName - if err := ioutil.WriteFile(filePath, cli.PrettyJSON(s), 0600); err != nil { + if err := os.WriteFile(filePath, cli.PrettyJSON(s), 0600); err != nil { nuvolaerror.HandleError(err, "Files - PrettyJSONToFile", "Error on writing file") } } diff --git a/tools/yamler/yamler.go b/tools/yamler/yamler.go index ad7a02f..829ea34 100644 --- a/tools/yamler/yamler.go +++ b/tools/yamler/yamler.go @@ -2,8 +2,8 @@ package yamler import ( "fmt" - "io/ioutil" "nuvola/tools/filesystem/files" + "os" "reflect" "strconv" "strings" @@ -34,7 +34,7 @@ type Find struct { func GetConf(file string) (c *Conf) { c = &Conf{} - yamlFile, err := ioutil.ReadFile(files.NormalizePath(file)) + yamlFile, err := os.ReadFile(files.NormalizePath(file)) if err != nil { nuvolaerror.HandleError(err, "Yamler - GetConf", "Error on reading rule file") } From ff2490ae8cc8cf48815dc0685842c5a9abc00e15 Mon Sep 17 00:00:00 2001 From: Edoardo Rosa <6991986+notdodo@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:28:01 +0200 Subject: [PATCH 2/7] enh: update deps, workflows and dependabot --- connector/services/neo4j/writer.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/connector/services/neo4j/writer.go b/connector/services/neo4j/writer.go index 9bd023e..d51ad84 100644 --- a/connector/services/neo4j/writer.go +++ b/connector/services/neo4j/writer.go @@ -2,9 +2,7 @@ package neo4j_connector import ( "context" - "encoding/json" "fmt" - "log" awsconfig "nuvola/connector/services/aws" servicesDatabase "nuvola/connector/services/aws/database" servicesEC2 "nuvola/connector/services/aws/ec2" @@ -319,12 +317,6 @@ func (nc *Neo4jClient) AddObjects(result map[string]interface{}, query string) { session := nc.NewSession() defer session.Close(context.TODO()) - b, e := json.Marshal(result) - if e != nil { - log.Fatal(e) - } - fmt.Println(string(b)) - _, err := session.ExecuteWrite(context.TODO(), func(tx neo4j.ManagedTransaction) (any, error) { var result, err = tx.Run(context.TODO(), query, result) From 6acf5c27428bcef1114280d5b487dc0547ce360e Mon Sep 17 00:00:00 2001 From: Edoardo Rosa <6991986+notdodo@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:32:23 +0200 Subject: [PATCH 3/7] fix: module name --- connector/cloud_connector.go | 3 ++- connector/connector_structs.go | 4 ++-- connector/services/aws/aws.go | 15 ++++++++------- connector/services/aws/database/dynamodb.go | 6 ++++-- connector/services/aws/database/rds.go | 6 ++++-- connector/services/aws/database/redshift.go | 6 ++++-- connector/services/aws/ec2/ec2s.go | 3 ++- connector/services/aws/ec2/structs.go | 3 ++- connector/services/aws/ec2/vpcs.go | 3 ++- connector/services/aws/iam/groups.go | 3 ++- connector/services/aws/iam/policies.go | 3 ++- connector/services/aws/iam/roles.go | 3 ++- connector/services/aws/iam/users.go | 3 ++- connector/services/aws/lambda/lambda.go | 6 ++++-- connector/services/aws/s3/s3.go | 6 ++++-- connector/services/aws/sts/sts.go | 2 +- connector/services/aws/tools.go | 3 ++- connector/services/neo4j/neo4j.go | 2 +- connector/services/neo4j/tools.go | 13 +++++++------ connector/services/neo4j/writer.go | 16 +++++++++------- connector/storage_connector.go | 18 ++++++++++-------- controller/assess/assess.go | 13 +++++++------ controller/dump/dump.go | 12 +++++++----- go.mod | 2 +- main.go | 14 ++++++++------ tests/tests.go | 2 +- tools/cli/input/cmdflags/cmdflags.go | 5 +++-- tools/cli/output/clioutput.go | 2 +- tools/filesystem/files/files.go | 5 +++-- tools/filesystem/zip/zip.go | 4 ++-- tools/yamler/yamler.go | 5 +++-- 31 files changed, 112 insertions(+), 79 deletions(-) diff --git a/connector/cloud_connector.go b/connector/cloud_connector.go index f5c6d94..a13b0e0 100644 --- a/connector/cloud_connector.go +++ b/connector/cloud_connector.go @@ -2,8 +2,9 @@ package connector import ( "errors" - awsconfig "nuvola/connector/services/aws" "strings" + + awsconfig "github.com/primait/nuvola/connector/services/aws" ) func NewCloudConnector(profile string, endpointUrl string) (*CloudConnector, error) { diff --git a/connector/connector_structs.go b/connector/connector_structs.go index cdad649..76ebf57 100644 --- a/connector/connector_structs.go +++ b/connector/connector_structs.go @@ -1,8 +1,8 @@ package connector import ( - awsconfig "nuvola/connector/services/aws" - neo4jconnector "nuvola/connector/services/neo4j" + awsconfig "github.com/primait/nuvola/connector/services/aws" + neo4jconnector "github.com/primait/nuvola/connector/services/neo4j" ) type StorageConnector struct { diff --git a/connector/services/aws/aws.go b/connector/services/aws/aws.go index 3a12c2c..c34b5b7 100644 --- a/connector/services/aws/aws.go +++ b/connector/services/aws/aws.go @@ -4,13 +4,14 @@ import ( "context" "os" - "nuvola/connector/services/aws/database" - "nuvola/connector/services/aws/ec2" - "nuvola/connector/services/aws/iam" - "nuvola/connector/services/aws/lambda" - "nuvola/connector/services/aws/s3" - "nuvola/connector/services/aws/sts" - nuvolaerror "nuvola/tools/error" + nuvolaerror "github.com/primait/nuvola/tools/error" + + "github.com/primait/nuvola/connector/services/aws/database" + "github.com/primait/nuvola/connector/services/aws/ec2" + "github.com/primait/nuvola/connector/services/aws/iam" + "github.com/primait/nuvola/connector/services/aws/lambda" + "github.com/primait/nuvola/connector/services/aws/s3" + "github.com/primait/nuvola/connector/services/aws/sts" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/retry" diff --git a/connector/services/aws/database/dynamodb.go b/connector/services/aws/database/dynamodb.go index edf6980..59bb2e3 100644 --- a/connector/services/aws/database/dynamodb.go +++ b/connector/services/aws/database/dynamodb.go @@ -3,8 +3,10 @@ package database import ( "context" "errors" - "nuvola/connector/services/aws/ec2" - nuvolaerror "nuvola/tools/error" + + nuvolaerror "github.com/primait/nuvola/tools/error" + + "github.com/primait/nuvola/connector/services/aws/ec2" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/dynamodb" diff --git a/connector/services/aws/database/rds.go b/connector/services/aws/database/rds.go index ce7ea6d..eef4098 100644 --- a/connector/services/aws/database/rds.go +++ b/connector/services/aws/database/rds.go @@ -3,8 +3,10 @@ package database import ( "context" "errors" - "nuvola/connector/services/aws/ec2" - nuvolaerror "nuvola/tools/error" + + nuvolaerror "github.com/primait/nuvola/tools/error" + + "github.com/primait/nuvola/connector/services/aws/ec2" "github.com/aws/aws-sdk-go-v2/aws" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" diff --git a/connector/services/aws/database/redshift.go b/connector/services/aws/database/redshift.go index e6a6002..b40f6b6 100644 --- a/connector/services/aws/database/redshift.go +++ b/connector/services/aws/database/redshift.go @@ -3,8 +3,10 @@ package database import ( "context" "errors" - "nuvola/connector/services/aws/ec2" - nuvolaerror "nuvola/tools/error" + + nuvolaerror "github.com/primait/nuvola/tools/error" + + "github.com/primait/nuvola/connector/services/aws/ec2" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/redshift" diff --git a/connector/services/aws/ec2/ec2s.go b/connector/services/aws/ec2/ec2s.go index 4578be7..919930e 100644 --- a/connector/services/aws/ec2/ec2s.go +++ b/connector/services/aws/ec2/ec2s.go @@ -4,9 +4,10 @@ import ( "context" b64 "encoding/base64" "errors" - nuvolaerror "nuvola/tools/error" "sync" + nuvolaerror "github.com/primait/nuvola/tools/error" + "github.com/aws/aws-sdk-go-v2/aws" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" "github.com/aws/aws-sdk-go-v2/service/ec2" diff --git a/connector/services/aws/ec2/structs.go b/connector/services/aws/ec2/structs.go index afbeff7..6b46428 100644 --- a/connector/services/aws/ec2/structs.go +++ b/connector/services/aws/ec2/structs.go @@ -3,7 +3,8 @@ package ec2 import ( "context" "errors" - nuvolaerror "nuvola/tools/error" + + nuvolaerror "github.com/primait/nuvola/tools/error" "github.com/aws/aws-sdk-go-v2/aws" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" diff --git a/connector/services/aws/ec2/vpcs.go b/connector/services/aws/ec2/vpcs.go index d4ffae4..4a14d2d 100644 --- a/connector/services/aws/ec2/vpcs.go +++ b/connector/services/aws/ec2/vpcs.go @@ -3,7 +3,8 @@ package ec2 import ( "context" "errors" - nuvolaerror "nuvola/tools/error" + + nuvolaerror "github.com/primait/nuvola/tools/error" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ec2" diff --git a/connector/services/aws/iam/groups.go b/connector/services/aws/iam/groups.go index 23c7d28..c609f3e 100644 --- a/connector/services/aws/iam/groups.go +++ b/connector/services/aws/iam/groups.go @@ -3,10 +3,11 @@ package iam import ( "context" "errors" - nuvolaerror "nuvola/tools/error" "sort" "sync" + nuvolaerror "github.com/primait/nuvola/tools/error" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/aws/aws-sdk-go-v2/service/iam/types" diff --git a/connector/services/aws/iam/policies.go b/connector/services/aws/iam/policies.go index f225274..dd73d78 100644 --- a/connector/services/aws/iam/policies.go +++ b/connector/services/aws/iam/policies.go @@ -6,9 +6,10 @@ import ( "errors" "fmt" "net/url" - nuvolaerror "nuvola/tools/error" "strings" + nuvolaerror "github.com/primait/nuvola/tools/error" + "github.com/aws/aws-sdk-go-v2/service/accessanalyzer" aat "github.com/aws/aws-sdk-go-v2/service/accessanalyzer/types" "github.com/aws/aws-sdk-go-v2/service/iam" diff --git a/connector/services/aws/iam/roles.go b/connector/services/aws/iam/roles.go index f60f6cb..18bd790 100644 --- a/connector/services/aws/iam/roles.go +++ b/connector/services/aws/iam/roles.go @@ -5,11 +5,12 @@ import ( "encoding/json" "errors" "net/url" - nuvolaerror "nuvola/tools/error" "reflect" "sort" "sync" + nuvolaerror "github.com/primait/nuvola/tools/error" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/aws/aws-sdk-go-v2/service/iam/types" diff --git a/connector/services/aws/iam/users.go b/connector/services/aws/iam/users.go index f6e2f28..93dc0ed 100644 --- a/connector/services/aws/iam/users.go +++ b/connector/services/aws/iam/users.go @@ -5,11 +5,12 @@ import ( "context" "errors" "log" - nuvolaerror "nuvola/tools/error" "sort" "sync" "time" + nuvolaerror "github.com/primait/nuvola/tools/error" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/iam" "github.com/aws/aws-sdk-go-v2/service/iam/types" diff --git a/connector/services/aws/lambda/lambda.go b/connector/services/aws/lambda/lambda.go index 65994a0..805a4f1 100644 --- a/connector/services/aws/lambda/lambda.go +++ b/connector/services/aws/lambda/lambda.go @@ -4,10 +4,12 @@ import ( "context" "encoding/json" "errors" - "nuvola/connector/services/aws/ec2" - nuvolaerror "nuvola/tools/error" "sync" + nuvolaerror "github.com/primait/nuvola/tools/error" + + "github.com/primait/nuvola/connector/services/aws/ec2" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/transport/http" "github.com/aws/aws-sdk-go-v2/service/lambda" diff --git a/connector/services/aws/s3/s3.go b/connector/services/aws/s3/s3.go index d9481a4..835bd05 100644 --- a/connector/services/aws/s3/s3.go +++ b/connector/services/aws/s3/s3.go @@ -4,12 +4,14 @@ import ( "context" "encoding/json" "errors" - "nuvola/connector/services/aws/ec2" - nuvolaerror "nuvola/tools/error" "sort" "strings" "sync" + nuvolaerror "github.com/primait/nuvola/tools/error" + + "github.com/primait/nuvola/connector/services/aws/ec2" + "github.com/aws/aws-sdk-go-v2/aws" awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" "github.com/aws/aws-sdk-go-v2/service/s3" diff --git a/connector/services/aws/sts/sts.go b/connector/services/aws/sts/sts.go index e3a39ee..f603aa7 100644 --- a/connector/services/aws/sts/sts.go +++ b/connector/services/aws/sts/sts.go @@ -4,7 +4,7 @@ import ( "context" "errors" - nuvolaerror "nuvola/tools/error" + nuvolaerror "github.com/primait/nuvola/tools/error" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/transport/http" diff --git a/connector/services/aws/tools.go b/connector/services/aws/tools.go index bcce808..e31f929 100644 --- a/connector/services/aws/tools.go +++ b/connector/services/aws/tools.go @@ -1,10 +1,11 @@ package awsconnector import ( - nuvolaerror "nuvola/tools/error" "strings" "time" + nuvolaerror "github.com/primait/nuvola/tools/error" + req "github.com/imroc/req/v3" "github.com/itchyny/gojq" "github.com/ohler55/ojg/oj" diff --git a/connector/services/neo4j/neo4j.go b/connector/services/neo4j/neo4j.go index 10c4375..96b19e7 100644 --- a/connector/services/neo4j/neo4j.go +++ b/connector/services/neo4j/neo4j.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - nuvolaerror "nuvola/tools/error" + nuvolaerror "github.com/primait/nuvola/tools/error" "github.com/neo4j/neo4j-go-driver/v5/neo4j" "github.com/neo4j/neo4j-go-driver/v5/neo4j/config" diff --git a/connector/services/neo4j/tools.go b/connector/services/neo4j/tools.go index f2ce0fd..161710f 100644 --- a/connector/services/neo4j/tools.go +++ b/connector/services/neo4j/tools.go @@ -7,12 +7,13 @@ import ( "strconv" "strings" - servicesDatabase "nuvola/connector/services/aws/database" - servicesEC2 "nuvola/connector/services/aws/ec2" - servicesIAM "nuvola/connector/services/aws/iam" - servicesLambda "nuvola/connector/services/aws/lambda" - servicesS3 "nuvola/connector/services/aws/s3" - nuvolaerror "nuvola/tools/error" + nuvolaerror "github.com/primait/nuvola/tools/error" + + servicesDatabase "github.com/primait/nuvola/connector/services/aws/database" + servicesEC2 "github.com/primait/nuvola/connector/services/aws/ec2" + servicesIAM "github.com/primait/nuvola/connector/services/aws/iam" + servicesLambda "github.com/primait/nuvola/connector/services/aws/lambda" + servicesS3 "github.com/primait/nuvola/connector/services/aws/s3" ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" rdstypes "github.com/aws/aws-sdk-go-v2/service/rds/types" diff --git a/connector/services/neo4j/writer.go b/connector/services/neo4j/writer.go index d51ad84..97692d2 100644 --- a/connector/services/neo4j/writer.go +++ b/connector/services/neo4j/writer.go @@ -3,13 +3,15 @@ package neo4j_connector import ( "context" "fmt" - awsconfig "nuvola/connector/services/aws" - servicesDatabase "nuvola/connector/services/aws/database" - servicesEC2 "nuvola/connector/services/aws/ec2" - servicesIAM "nuvola/connector/services/aws/iam" - servicesLambda "nuvola/connector/services/aws/lambda" - servicesS3 "nuvola/connector/services/aws/s3" - nuvolaerror "nuvola/tools/error" + + nuvolaerror "github.com/primait/nuvola/tools/error" + + awsconfig "github.com/primait/nuvola/connector/services/aws" + servicesDatabase "github.com/primait/nuvola/connector/services/aws/database" + servicesEC2 "github.com/primait/nuvola/connector/services/aws/ec2" + servicesIAM "github.com/primait/nuvola/connector/services/aws/iam" + servicesLambda "github.com/primait/nuvola/connector/services/aws/lambda" + servicesS3 "github.com/primait/nuvola/connector/services/aws/s3" "strings" diff --git a/connector/storage_connector.go b/connector/storage_connector.go index b62081b..8e0b494 100644 --- a/connector/storage_connector.go +++ b/connector/storage_connector.go @@ -3,17 +3,19 @@ package connector import ( "encoding/json" "fmt" - "nuvola/connector/services/aws/database" - "nuvola/connector/services/aws/ec2" - "nuvola/connector/services/aws/iam" - "nuvola/connector/services/aws/lambda" - "nuvola/connector/services/aws/s3" - neo4jconnector "nuvola/connector/services/neo4j" - cli_output "nuvola/tools/cli/output" - nuvolaerror "nuvola/tools/error" "os" "regexp" + cli_output "github.com/primait/nuvola/tools/cli/output" + nuvolaerror "github.com/primait/nuvola/tools/error" + + "github.com/primait/nuvola/connector/services/aws/database" + "github.com/primait/nuvola/connector/services/aws/ec2" + "github.com/primait/nuvola/connector/services/aws/iam" + "github.com/primait/nuvola/connector/services/aws/lambda" + "github.com/primait/nuvola/connector/services/aws/s3" + neo4jconnector "github.com/primait/nuvola/connector/services/neo4j" + "github.com/joho/godotenv" ) diff --git a/controller/assess/assess.go b/controller/assess/assess.go index f42a98f..9250b04 100644 --- a/controller/assess/assess.go +++ b/controller/assess/assess.go @@ -8,12 +8,13 @@ import ( "log" "strings" - connector "nuvola/connector" - clioutput "nuvola/tools/cli/output" - nuvolaerror "nuvola/tools/error" - "nuvola/tools/filesystem/files" - unzip "nuvola/tools/filesystem/zip" - "nuvola/tools/yamler" + connector "github.com/primait/nuvola/connector" + + clioutput "github.com/primait/nuvola/tools/cli/output" + nuvolaerror "github.com/primait/nuvola/tools/error" + "github.com/primait/nuvola/tools/filesystem/files" + unzip "github.com/primait/nuvola/tools/filesystem/zip" + "github.com/primait/nuvola/tools/yamler" ) func ImportZipFile(connector *connector.StorageConnector, zipfile string) { diff --git a/controller/dump/dump.go b/controller/dump/dump.go index c9d5bd1..051b208 100644 --- a/controller/dump/dump.go +++ b/controller/dump/dump.go @@ -3,13 +3,15 @@ package dump import ( "encoding/json" "fmt" - "nuvola/connector" - clioutput "nuvola/tools/cli/output" - nuvolaerror "nuvola/tools/error" - "nuvola/tools/filesystem/files" - "nuvola/tools/filesystem/zip" "reflect" "time" + + "github.com/primait/nuvola/connector" + + clioutput "github.com/primait/nuvola/tools/cli/output" + nuvolaerror "github.com/primait/nuvola/tools/error" + "github.com/primait/nuvola/tools/filesystem/files" + "github.com/primait/nuvola/tools/filesystem/zip" ) var AWSResults = map[string]interface{}{ diff --git a/go.mod b/go.mod index e037362..5beecec 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module nuvola +module github.com/primait/nuvola go 1.21 diff --git a/main.go b/main.go index b551eb2..234a879 100644 --- a/main.go +++ b/main.go @@ -7,12 +7,14 @@ import ( "os" - "nuvola/connector" - "nuvola/controller/assess" - "nuvola/controller/dump" - "nuvola/controller/enumerate" - "nuvola/tools/cli/input/cmdflags" - clioutput "nuvola/tools/cli/output" + "github.com/primait/nuvola/controller/assess" + "github.com/primait/nuvola/controller/dump" + "github.com/primait/nuvola/controller/enumerate" + + "github.com/primait/nuvola/connector" + + "github.com/primait/nuvola/tools/cli/input/cmdflags" + clioutput "github.com/primait/nuvola/tools/cli/output" ) func main() { diff --git a/tests/tests.go b/tests/tests.go index d3dd37a..f2c71ae 100644 --- a/tests/tests.go +++ b/tests/tests.go @@ -3,7 +3,7 @@ package tests import ( "context" - awsconnector "nuvola/connector/services/aws" + awsconnector "github.com/primait/nuvola/connector/services/aws" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/retry" diff --git a/tools/cli/input/cmdflags/cmdflags.go b/tools/cli/input/cmdflags/cmdflags.go index 1ee0eb6..d02803a 100644 --- a/tools/cli/input/cmdflags/cmdflags.go +++ b/tools/cli/input/cmdflags/cmdflags.go @@ -3,9 +3,10 @@ package cmdflags import ( "flag" "log" - nuvolaerror "nuvola/tools/error" - "nuvola/tools/filesystem/files" "os" + + nuvolaerror "github.com/primait/nuvola/tools/error" + "github.com/primait/nuvola/tools/filesystem/files" ) var AWS_PROFILE string diff --git a/tools/cli/output/clioutput.go b/tools/cli/output/clioutput.go index bed100a..853342b 100644 --- a/tools/cli/output/clioutput.go +++ b/tools/cli/output/clioutput.go @@ -4,7 +4,7 @@ import ( "encoding/json" "strings" - nuvolaerror "nuvola/tools/error" + nuvolaerror "github.com/primait/nuvola/tools/error" "github.com/fatih/color" ) diff --git a/tools/filesystem/files/files.go b/tools/filesystem/files/files.go index 867c365..bcdb53d 100644 --- a/tools/filesystem/files/files.go +++ b/tools/filesystem/files/files.go @@ -2,13 +2,14 @@ package files import ( "io/fs" - cli "nuvola/tools/cli/output" - nuvolaerror "nuvola/tools/error" "os" "os/user" "path/filepath" "regexp" "strings" + + cli "github.com/primait/nuvola/tools/cli/output" + nuvolaerror "github.com/primait/nuvola/tools/error" ) func PrettyJSONToFile(filePath string, fileName string, s interface{}) { diff --git a/tools/filesystem/zip/zip.go b/tools/filesystem/zip/zip.go index 7689541..9bece6d 100644 --- a/tools/filesystem/zip/zip.go +++ b/tools/filesystem/zip/zip.go @@ -7,8 +7,8 @@ import ( "path/filepath" "time" - print "nuvola/tools/cli/output" - nuvolaerror "nuvola/tools/error" + print "github.com/primait/nuvola/tools/cli/output" + nuvolaerror "github.com/primait/nuvola/tools/error" ) func Zip(path string, profile string, values *map[string]interface{}) { diff --git a/tools/yamler/yamler.go b/tools/yamler/yamler.go index 829ea34..173889a 100644 --- a/tools/yamler/yamler.go +++ b/tools/yamler/yamler.go @@ -2,13 +2,14 @@ package yamler import ( "fmt" - "nuvola/tools/filesystem/files" "os" "reflect" "strconv" "strings" - nuvolaerror "nuvola/tools/error" + "github.com/primait/nuvola/tools/filesystem/files" + + nuvolaerror "github.com/primait/nuvola/tools/error" "golang.org/x/text/cases" "golang.org/x/text/language" From ce7fec487de77cd739d93f2aac38be4ebe820b49 Mon Sep 17 00:00:00 2001 From: Edoardo Rosa <6991986+notdodo@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:33:13 +0200 Subject: [PATCH 4/7] fix: use github secrets scanning --- .github/workflows/gitleaks.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .github/workflows/gitleaks.yml diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml deleted file mode 100644 index 61b90c9..0000000 --- a/.github/workflows/gitleaks.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Gitleaks -on: - pull_request: - -jobs: - gitleaks: - name: gitleaks - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - # v4.1.2 - with: - fetch-depth: 0 - - name: gitleaks - uses: gitleaks/gitleaks-action@e6dab246340401bf53eec993b8f05aebe80ac636 - # v2.3.4 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITLEAKS_VERSION: latest From 9b5288247cb4c29138ed92a28710b8b52596b25c Mon Sep 17 00:00:00 2001 From: Edoardo Rosa <6991986+notdodo@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:42:30 +0200 Subject: [PATCH 5/7] fix: go-version must be inside quotes --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/{golanci.yml => golangci.yml} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{golanci.yml => golangci.yml} (97%) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8d0c364..dc61706 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,4 +8,4 @@ This pull request updates the query to load data into Neo4j database using an th ## Checks -- [] I have addressed any CI failures that surfaced when I created my pull request +- [ ] I have addressed any CI failures that surfaced when I created my pull request diff --git a/.github/workflows/golanci.yml b/.github/workflows/golangci.yml similarity index 97% rename from .github/workflows/golanci.yml rename to .github/workflows/golangci.yml index 87321ef..12ff306 100644 --- a/.github/workflows/golanci.yml +++ b/.github/workflows/golangci.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.20 + go-version: "1.20" - name: golangci-lint uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0 @@ -80,7 +80,7 @@ jobs: uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: 1.20 + go-version: "1.20" - name: Install dependencies run: go get . - name: Build From f98b77c6c226167e2738013c0f6c3c88f42d5af1 Mon Sep 17 00:00:00 2001 From: Edoardo Rosa <6991986+notdodo@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:44:07 +0200 Subject: [PATCH 6/7] fix: remove toolchain --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 5beecec..7f6fc6f 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/primait/nuvola go 1.21 -toolchain go1.21.6 - require ( github.com/aws/aws-sdk-go-v2 v1.26.1 github.com/aws/aws-sdk-go-v2/config v1.27.11 From 9096cdc62927b48ba9cd5360080daba7f0258004 Mon Sep 17 00:00:00 2001 From: Edoardo Rosa <6991986+notdodo@users.noreply.github.com> Date: Fri, 12 Apr 2024 23:47:08 +0200 Subject: [PATCH 7/7] fix: update go version --- .github/workflows/golangci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/golangci.yml b/.github/workflows/golangci.yml index 12ff306..8fee644 100644 --- a/.github/workflows/golangci.yml +++ b/.github/workflows/golangci.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: "1.20" + go-version: "1.21" - name: golangci-lint uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0 @@ -80,7 +80,7 @@ jobs: uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: "1.20" + go-version: "1.21" - name: Install dependencies run: go get . - name: Build