Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package digger-cli for openSUSE:Factory checked in at 2025-02-07 23:08:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digger-cli (Old) and /work/SRC/openSUSE:Factory/.digger-cli.new.2316 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digger-cli" Fri Feb 7 23:08:52 2025 rev:5 rq:1244214 version:0.6.84 Changes: -------- --- /work/SRC/openSUSE:Factory/digger-cli/digger-cli.changes 2025-01-13 17:50:36.663820611 +0100 +++ /work/SRC/openSUSE:Factory/.digger-cli.new.2316/digger-cli.changes 2025-02-07 23:12:51.892954969 +0100 @@ -1,0 +2,8 @@ +Fri Feb 07 17:04:20 UTC 2025 - [email protected] + +- Update to version 0.6.84: + * fix env variable interpolation for backendless mode (#1880) + * allow cache values to be overridable for terraform and + terragrunt (#1873) + +------------------------------------------------------------------- Old: ---- digger-cli-0.6.83.obscpio New: ---- digger-cli-0.6.84.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digger-cli.spec ++++++ --- /var/tmp/diff_new_pack.NsKStp/_old 2025-02-07 23:12:52.892996371 +0100 +++ /var/tmp/diff_new_pack.NsKStp/_new 2025-02-07 23:12:52.892996371 +0100 @@ -19,7 +19,7 @@ %define executable_name digger Name: digger-cli -Version: 0.6.83 +Version: 0.6.84 Release: 0 Summary: CLI for the digger open source IaC orchestration tool License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.NsKStp/_old 2025-02-07 23:12:52.924997696 +0100 +++ /var/tmp/diff_new_pack.NsKStp/_new 2025-02-07 23:12:52.928997862 +0100 @@ -6,7 +6,7 @@ <param name="exclude">go.mod</param> <param name="exclude">go.work</param> <param name="exclude">go.work.sum</param> - <param name="revision">v0.6.83</param> + <param name="revision">v0.6.84</param> <param name="match-tag">v*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.NsKStp/_old 2025-02-07 23:12:52.948998690 +0100 +++ /var/tmp/diff_new_pack.NsKStp/_new 2025-02-07 23:12:52.952998856 +0100 @@ -1,7 +1,7 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/diggerhq/digger</param> - <param name="changesrevision">1e88db8cfe3ae88eb5d1b0633f453cfc72407075</param></service><service name="tar_scm"> + <param name="changesrevision">7deabf0b5ed958526064be735c821fc5cfda6361</param></service><service name="tar_scm"> <param name="url">https://github.com/johanneskastl/digger</param> <param name="changesrevision">8fe377068e53e2050ff4c745388d8428d2b13bb0</param></service></servicedata> (No newline at EOF) ++++++ digger-cli-0.6.83.obscpio -> digger-cli-0.6.84.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/digger-cli-0.6.83/.github/workflows/libs_test.yml new/digger-cli-0.6.84/.github/workflows/libs_test.yml --- old/digger-cli-0.6.83/.github/workflows/libs_test.yml 2025-01-11 17:36:54.000000000 +0100 +++ new/digger-cli-0.6.84/.github/workflows/libs_test.yml 2025-02-04 19:48:40.000000000 +0100 @@ -16,6 +16,12 @@ uses: opentofu/[email protected] with: tofu_version: 1.8.5 + + - name: Setup terraform + uses: hashicorp/setup-terraform@v3 + with: + terraform_wrapper: false + terraform_version: "1.5.5" - name: Download Go uses: actions/setup-go@v5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/digger-cli-0.6.83/action.yml new/digger-cli-0.6.84/action.yml --- old/digger-cli-0.6.83/action.yml 2025-01-11 17:36:54.000000000 +0100 +++ new/digger-cli-0.6.84/action.yml 2025-02-04 19:48:40.000000000 +0100 @@ -167,6 +167,11 @@ description: "Leverage actions/cache to cache dependencies to speed up execution" required: false default: 'false' + terraform-cache-dir: + description: "allows overriding of the terraform cache dir which defaults to ${github.workspace}/cache" + required: false + default: '' + digger-spec: description: "(orchestrator only) the spec to pass onto digger cli" required: false @@ -247,11 +252,21 @@ subscription-id: ${{ inputs.azure-subscription-id }} if: ${{ inputs.setup-azure == 'true' && inputs.azure-client-id != '' }} + # if terraform-cache-dir is set then we set it to that otherwise set it to '${{github.workspace}}/cache' + - name: retrieve cache dir + shell: bash + run: | + CACHE_DIR=${{ inputs.terraform-cache-dir == '' && + format('{0}/cache', github.workspace) || + inputs.terraform-cache-dir }} + echo "TF_PLUGIN_CACHE_DIR=$CACHE_DIR" >> $GITHUB_ENV + echo "TERRAGRUNT_PROVIDER_CACHE_DIR=$CACHE_DIR" >> $GITHUB_ENV + - uses: actions/cache/restore@v4 id: restore_cache name: restore_cache with: - path: ${{ github.workspace }}/cache + path: $TF_PLUGIN_CACHE_DIR key: digger-cache restore-keys: | digger-cache @@ -346,6 +361,7 @@ mkdir -p $GITHUB_WORKSPACE/cache shell: bash + - name: build and run digger if: ${{ !startsWith(github.action_ref, 'v') }} shell: bash @@ -369,9 +385,7 @@ INPUT_DRIFT_DETECTION_SLACK_NOTIFICATION_URL: ${{ inputs.drift-detection-slack-notification-url }} NO_BACKEND: ${{ inputs.no-backend }} DEBUG: 'true' - TF_PLUGIN_CACHE_DIR: ${{ github.workspace }}/cache TERRAGRUNT_PROVIDER_CACHE: ${{ inputs.cache-dependencies == 'true' && 1 || 0 }} - TERRAGRUNT_PROVIDER_CACHE_DIR: ${{ github.workspace }}/cache DIGGER_RUN_SPEC: ${{inputs.digger-spec}} run: | if [[ ${{ inputs.ee }} == "true" ]]; then @@ -407,9 +421,7 @@ INPUT_DIGGER_COMMAND: ${{ inputs.command }} INPUT_DRIFT_DETECTION_SLACK_NOTIFICATION_URL: ${{ inputs.drift-detection-slack-notification-url }} NO_BACKEND: ${{ inputs.no-backend }} - TF_PLUGIN_CACHE_DIR: ${{ github.workspace }}/cache TERRAGRUNT_PROVIDER_CACHE: ${{ inputs.cache-dependencies == 'true' && 1 || 0 }} - TERRAGRUNT_PROVIDER_CACHE_DIR: ${{ github.workspace }}/cache DIGGER_RUN_SPEC: ${{inputs.digger-spec}} id: digger shell: bash @@ -428,7 +440,7 @@ name: cache-save if: ${{ always() && inputs.cache-dependencies == 'true' && steps.restore_cache.outputs.cache-hit != 'true' }} with: - path: ${{ github.workspace }}/cache + path: $TF_PLUGIN_CACHE_DIR key: digger-cache-${{ hashFiles('**/cache') }} branding: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/digger-cli-0.6.83/cli/pkg/digger/digger.go new/digger-cli-0.6.84/cli/pkg/digger/digger.go --- old/digger-cli-0.6.83/cli/pkg/digger/digger.go 2025-01-11 17:36:54.000000000 +0100 +++ new/digger-cli-0.6.84/cli/pkg/digger/digger.go 2025-02-04 19:48:40.000000000 +0100 @@ -65,9 +65,11 @@ } func RunJobs(jobs []orchestrator.Job, prService ci.PullRequestService, orgService ci.OrgService, lock locking2.Lock, reporter reporting.Reporter, planStorage storage.PlanStorage, policyChecker policy.Checker, commentUpdater comment_updater.CommentUpdater, backendApi backendapi.Api, jobId string, reportFinalStatusToBackend bool, reportTerraformOutput bool, prCommentId string, workingDir string) (bool, bool, error) { - defer reporter.Flush() + log.Printf("Info: [TF_PLUGIN_CACHE_DIR=%v] ", os.Getenv("TF_PLUGIN_CACHE_DIR")) + log.Printf("Info: [TERRAGRUNT_PROVIDER_CACHE_DIR=%v", os.Getenv("TERRAGRUNT_PROVIDER_CACHE_DIR")) + runStartedAt := time.Now() exectorResults := make([]execution.DiggerExecutorResult, len(jobs)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/digger-cli-0.6.83/ee/backend/controllers/spec.go new/digger-cli-0.6.84/ee/backend/controllers/spec.go --- old/digger-cli-0.6.83/ee/backend/controllers/spec.go 2025-01-11 17:36:54.000000000 +0100 +++ new/digger-cli-0.6.84/ee/backend/controllers/spec.go 2025-02-04 19:48:40.000000000 +0100 @@ -54,7 +54,7 @@ workflowFile := project.WorkflowFile - jobs, err := generic.CreateJobsForProjects([]digger_config.Project{project}, command, "manual", repoFullName, actor, config.Workflows, &issueNumber, &commitSha, "", "") + jobs, err := generic.CreateJobsForProjects([]digger_config.Project{project}, command, "manual", repoFullName, actor, config.Workflows, &issueNumber, &commitSha, "", "", false) if err != nil { log.Printf("could not create jobs based on project: %v", err) c.String(500, fmt.Sprintf("could not create jobs based on project: %v", err)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/digger-cli-0.6.83/ee/drift/controllers/drift.go new/digger-cli-0.6.84/ee/drift/controllers/drift.go --- old/digger-cli-0.6.83/ee/drift/controllers/drift.go 2025-01-11 17:36:54.000000000 +0100 +++ new/digger-cli-0.6.84/ee/drift/controllers/drift.go 2025-02-04 19:48:40.000000000 +0100 @@ -88,7 +88,7 @@ } projects := []dg_configuration.Project{*theProject} - jobsForImpactedProjects, err := generic.CreateJobsForProjects(projects, command, "drift", repoFullName, "digger", config.Workflows, &issueNumber, nil, branch, branch) + jobsForImpactedProjects, err := generic.CreateJobsForProjects(projects, command, "drift", repoFullName, "digger", config.Workflows, &issueNumber, nil, branch, branch, false) if err != nil { log.Printf("error converting digger project %v to job", project.Name, err) c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("could not find project %v in digger.yml", theProject)}) @@ -207,14 +207,14 @@ } if matches { - log.Printf("Crontab matched for org: %v %v", orgSetting.OrgID, cron); + log.Printf("Crontab matched for org: %v %v", orgSetting.OrgID, cron) err := sendProcessDriftForOrgRequest(orgSetting.OrgID) if err != nil { log.Printf("Failed to send request to process drift for org: %v", orgSetting.OrgID) continue } } else { - log.Printf("Crontab ignored for org: %v %v", orgSetting.OrgID, cron); + log.Printf("Crontab ignored for org: %v %v", orgSetting.OrgID, cron) } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/digger-cli-0.6.83/libs/ci/generic/events.go new/digger-cli-0.6.84/libs/ci/generic/events.go --- old/digger-cli-0.6.83/libs/ci/generic/events.go 2025-01-11 17:36:54.000000000 +0100 +++ new/digger-cli-0.6.84/libs/ci/generic/events.go 2025-02-04 19:48:40.000000000 +0100 @@ -129,7 +129,7 @@ return nil, false, fmt.Errorf("command is not supported: %v", diggerCommand) } - jobs, err := CreateJobsForProjects(runForProjects, commandToRun, "issue_comment", repoFullName, requestedBy, workflows, &prNumber, nil, defaultBranch, prBranch) + jobs, err := CreateJobsForProjects(runForProjects, commandToRun, "issue_comment", repoFullName, requestedBy, workflows, &prNumber, nil, defaultBranch, prBranch, true) if err != nil { return nil, false, err } @@ -138,7 +138,7 @@ } -func CreateJobsForProjects(projects []digger_config.Project, command string, event string, repoFullName string, requestedBy string, workflows map[string]digger_config.Workflow, issueNumber *int, commitSha *string, defaultBranch string, prBranch string) ([]scheduler.Job, error) { +func CreateJobsForProjects(projects []digger_config.Project, command string, event string, repoFullName string, requestedBy string, workflows map[string]digger_config.Workflow, issueNumber *int, commitSha *string, defaultBranch string, prBranch string, performEnvVarsInterpolations bool) ([]scheduler.Job, error) { jobs := make([]scheduler.Job, 0) for _, project := range projects { @@ -166,7 +166,7 @@ } runEnvVars := GetRunEnvVars(defaultBranch, prBranch, project.Name, project.Dir) - stateEnvVars, commandEnvVars := digger_config.CollectTerraformEnvConfig(workflow.EnvVars, false) + stateEnvVars, commandEnvVars := digger_config.CollectTerraformEnvConfig(workflow.EnvVars, performEnvVarsInterpolations) StateEnvProvider, CommandEnvProvider := scheduler.GetStateAndCommandProviders(project) workspace := project.Workspace jobs = append(jobs, scheduler.Job{ @@ -189,8 +189,8 @@ RequestedBy: requestedBy, StateEnvProvider: StateEnvProvider, CommandEnvProvider: CommandEnvProvider, - CommandRoleArn: cmdRole, - StateRoleArn: stateRole, + CommandRoleArn: cmdRole, + StateRoleArn: stateRole, CognitoOidcConfig: project.AwsCognitoOidcConfig, SkipMergeCheck: skipMerge, }) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/digger-cli-0.6.83/next/controllers/github_after_merge.go new/digger-cli-0.6.84/next/controllers/github_after_merge.go --- old/digger-cli-0.6.83/next/controllers/github_after_merge.go 2025-01-11 17:36:54.000000000 +0100 +++ new/digger-cli-0.6.84/next/controllers/github_after_merge.go 2025-02-04 19:48:40.000000000 +0100 @@ -100,13 +100,13 @@ // TODO: find a way to set the right PR branch issueNumber := 0 - planJobs, err := generic.CreateJobsForProjects(impactedProjects, "digger plan", "push", repoFullName, requestedBy, config.Workflows, &issueNumber, &commitId, targetBranch, targetBranch) + planJobs, err := generic.CreateJobsForProjects(impactedProjects, "digger plan", "push", repoFullName, requestedBy, config.Workflows, &issueNumber, &commitId, targetBranch, targetBranch, false) if err != nil { log.Printf("Error creating jobs: %v", err) return fmt.Errorf("error creating jobs") } - applyJobs, err := generic.CreateJobsForProjects(impactedProjects, "digger apply", "push", repoFullName, requestedBy, config.Workflows, &issueNumber, &commitId, targetBranch, targetBranch) + applyJobs, err := generic.CreateJobsForProjects(impactedProjects, "digger apply", "push", repoFullName, requestedBy, config.Workflows, &issueNumber, &commitId, targetBranch, targetBranch, false) if err != nil { log.Printf("Error creating jobs: %v", err) return fmt.Errorf("error creating jobs") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/digger-cli-0.6.83/next/services/scheduler.go new/digger-cli-0.6.84/next/services/scheduler.go --- old/digger-cli-0.6.83/next/services/scheduler.go 2025-01-11 17:36:54.000000000 +0100 +++ new/digger-cli-0.6.84/next/services/scheduler.go 2025-02-04 19:48:40.000000000 +0100 @@ -169,7 +169,7 @@ issueNumber := 0 - jobs, err := generic.CreateJobsForProjects(dgprojects, command, string(event), repoFullName, "digger", config.Workflows, &issueNumber, nil, branch, branch) + jobs, err := generic.CreateJobsForProjects(dgprojects, command, string(event), repoFullName, "digger", config.Workflows, &issueNumber, nil, branch, branch, false) if err != nil { log.Printf("Error creating jobs: %v", err) return nil, nil, fmt.Errorf("error creating jobs: %v", err) ++++++ digger-cli.obsinfo ++++++ --- /var/tmp/diff_new_pack.NsKStp/_old 2025-02-07 23:12:53.757032143 +0100 +++ /var/tmp/diff_new_pack.NsKStp/_new 2025-02-07 23:12:53.761032308 +0100 @@ -1,5 +1,5 @@ name: digger-cli -version: 0.6.83 -mtime: 1736613414 -commit: 1e88db8cfe3ae88eb5d1b0633f453cfc72407075 +version: 0.6.84 +mtime: 1738694920 +commit: 7deabf0b5ed958526064be735c821fc5cfda6361 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/digger-cli/vendor.tar.gz /work/SRC/openSUSE:Factory/.digger-cli.new.2316/vendor.tar.gz differ: char 5, line 1
