Merge pull request #8895 from concourse/rebase-master-7.11.1

Rebase master 7.11.1

.github/renovate.json

@@ -21,8 +21,7 @@
  },
  {
  "matchPackageNames": ["gopkg.in/yaml.v2"],
- "allowedVersions": "<3.0.0",
- "_context": "v3 will cause indent problem when marshalling, which requires test updates and we dont know the full impact. See https://github.com/go-yaml/yaml/issues/661."
+ "allowedVersions": "<3.0.0"
  }
  ],
  "ignoreDeps": ["elm", "client-go"],

.github/workflows/codeql-analysis.yml

@@ -41,9 +41,14 @@ jobs:
  - name: Checkout repository
  uses: actions/checkout@v4
 
+ - name: Install Go
+ uses: actions/setup-go@v5
+ with:
+ go-version-file: go.mod
+
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
  with:
  languages: ${{ matrix.language }}
  # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +59,7 @@ jobs:
  # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
  # If this step fails, then you should remove it and run the build manually (see below)
  - name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ uses: github/codeql-action/autobuild@v3
 
  # ℹ️ Command-line programs to run using the OS shell.
  # 📚 https://git.io/JvXDl
@@ -68,4 +73,4 @@ jobs:
  # make release
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3

atc/api/info_test.go

@@ -108,7 +108,7 @@ var _ = Describe("Pipelines API", func() {
  fakeAccess.IsAuthenticatedReturns(true)
  fakeAccess.IsAdminReturns(true)
 
- ssmAccess := ssm.NewSsm(lager.NewLogger("ssm_test"), &mockService, nil)
+ ssmAccess := ssm.NewSsm(lager.NewLogger("ssm_test"), &mockService, nil, "")
  ssmManager := &ssm.SsmManager{
  AwsAccessKeyID: "",
  AwsSecretAccessKey: "",
@@ -140,6 +140,7 @@ var _ = Describe("Pipelines API", func() {
  "method": "GetParameter"
  },
  "pipeline_secret_template": "pipeline-secret-template",
+ "shared_path": "",
  "team_secret_template": "team-secret-template"
  }
  }`))
@@ -165,6 +166,7 @@ var _ = Describe("Pipelines API", func() {
  "method": "GetParameter"
  },
  "pipeline_secret_template": "pipeline-secret-template",
+ "shared_path": "",
  "team_secret_template": "team-secret-template"
  }
  }`))

atc/api/jobserver/create_build.go

@@ -21,7 +21,7 @@ func (s *Server) CreateJobBuild(pipeline db.Pipeline) http.Handler {
 
  job, found, err := pipeline.Job(jobName)
  if err != nil {
- logger.Error("failed-to-get-resource-types", err)
+ logger.Error("failed-to-get-job", err)
  w.WriteHeader(http.StatusInternalServerError)
  return
  }

atc/creds/ssm/manager.go

@@ -24,6 +24,7 @@ type SsmManager struct {
  AwsRegion string `mapstructure:"region" long:"region" description:"AWS region to send requests to"`
  PipelineSecretTemplate string `mapstructure:"pipeline_secret_template" long:"pipeline-secret-template" description:"AWS SSM parameter name template used for pipeline specific parameter" default:"/concourse/{{.Team}}/{{.Pipeline}}/{{.Secret}}"`
  TeamSecretTemplate string `mapstructure:"team_secret_template" long:"team-secret-template" description:"AWS SSM parameter name template used for team specific parameter" default:"/concourse/{{.Team}}/{{.Secret}}"`
+ SharedPath string `mapstructure:"shared_path" long:"shared-path" description:"AWS SSM parameter path used for shared parameters"`
  Ssm *Ssm
 }
 
@@ -37,6 +38,7 @@ func (manager *SsmManager) MarshalJSON() ([]byte, error) {
  "aws_region": manager.AwsRegion,
  "pipeline_secret_template": manager.PipelineSecretTemplate,
  "team_secret_template": manager.TeamSecretTemplate,
+ "shared_path": manager.SharedPath,
  "health": health,
  })
 }
@@ -139,7 +141,7 @@ func (manager *SsmManager) NewSecretsFactory(log lager.Logger) (creds.SecretsFac
  return nil, err
  }
 
- return NewSsmFactory(log, session, []*creds.SecretTemplate{pipelineSecretTemplate, teamSecretTemplate}), nil
+ return NewSsmFactory(log, session, []*creds.SecretTemplate{pipelineSecretTemplate, teamSecretTemplate}, manager.SharedPath), nil
 }
 
 func (manager *SsmManager) Close(logger lager.Logger) {

atc/creds/ssm/ssm.go

@@ -17,13 +17,15 @@ type Ssm struct {
  log lager.Logger
  api ssmiface.SSMAPI
  secretTemplates []*creds.SecretTemplate
+ sharedPath string
 }
 
-func NewSsm(log lager.Logger, api ssmiface.SSMAPI, secretTemplates []*creds.SecretTemplate) *Ssm {
+func NewSsm(log lager.Logger, api ssmiface.SSMAPI, secretTemplates []*creds.SecretTemplate, sharedPath string) *Ssm {
  return &Ssm{
  log: log,
  api: api,
  secretTemplates: secretTemplates,
+ sharedPath: sharedPath,
  }
 }
 
@@ -35,6 +37,9 @@ func (s *Ssm) NewSecretLookupPaths(teamName string, pipelineName string, allowRo
  lookupPaths = append(lookupPaths, lPath)
  }
  }
+ if s.sharedPath != "" {
+ lookupPaths = append(lookupPaths, creds.NewSecretLookupWithPrefix(s.sharedPath+"/"))
+ }
  return lookupPaths
 }
 

atc/creds/ssm/ssm_factory.go

@@ -11,16 +11,18 @@ type ssmFactory struct {
  log lager.Logger
  api *ssm.SSM
  secretTemplates []*creds.SecretTemplate
+ sharedPath string
 }
 
-func NewSsmFactory(log lager.Logger, session *session.Session, secretTemplates []*creds.SecretTemplate) *ssmFactory {
+func NewSsmFactory(log lager.Logger, session *session.Session, secretTemplates []*creds.SecretTemplate, sharedPath string) *ssmFactory {
  return &ssmFactory{
  log: log,
  api: ssm.New(session),
  secretTemplates: secretTemplates,
+ sharedPath: sharedPath,
  }
 }
 
 func (factory *ssmFactory) NewSecrets() creds.Secrets {
- return NewSsm(factory.log, factory.api, factory.secretTemplates)
+ return NewSsm(factory.log, factory.api, factory.secretTemplates, factory.sharedPath)
 }

atc/creds/ssm/ssm_test.go

@@ -98,7 +98,7 @@ var _ = Describe("Ssm", func() {
  t2, err := creds.BuildSecretTemplate("t2", DefaultTeamSecretTemplate)
  Expect(t2).NotTo(BeNil())
  Expect(err).To(BeNil())
- ssmAccess = NewSsm(lagertest.NewTestLogger("ssm_test"), &mockService, []*creds.SecretTemplate{t1, t2})
+ ssmAccess = NewSsm(lagertest.NewTestLogger("ssm_test"), &mockService, []*creds.SecretTemplate{t1, t2}, "/concourse/shared")
  variables = creds.NewVariables(ssmAccess, "alpha", "bogus", false)
  Expect(ssmAccess).NotTo(BeNil())
  mockService.stubGetParameter = func(input string) (string, error) {
@@ -120,7 +120,7 @@ var _ = Describe("Ssm", func() {
  Expect(err).To(BeNil())
  })
 
- It("should get complex paramter", func() {
+ It("should get complex parameter", func() {
  mockService.stubGetParametersByPathPages = func(path string) []mockPathResultPage {
  return []mockPathResultPage{
  {
@@ -164,6 +164,19 @@ var _ = Describe("Ssm", func() {
  Expect(err).To(BeNil())
  })
 
+ It("should get shared parameter if exists", func() {
+ mockService.stubGetParameter = func(input string) (string, error) {
+ if input != "/concourse/shared/cheery" {
+ return "", awserr.New(ssm.ErrCodeParameterNotFound, "", nil)
+ }
+ return "shared decrypted value", nil
+ }
+ value, found, err := variables.Get(varRef)
+ Expect(value).To(BeEquivalentTo("shared decrypted value"))
+ Expect(found).To(BeTrue())
+ Expect(err).To(BeNil())
+ })
+
  It("should return not found on error", func() {
  mockService.stubGetParameter = nil
  value, found, err := variables.Get(varRef)

atc/db/job_test.go

@@ -11,7 +11,8 @@ import (
  "github.com/concourse/concourse/tracing"
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
- "go.opentelemetry.io/otel/oteltest"
+ "go.opentelemetry.io/otel/sdk/trace"
+ "go.opentelemetry.io/otel/sdk/trace/tracetest"
 )
 
 var _ = Describe("Job", func() {
@@ -2028,7 +2029,9 @@ var _ = Describe("Job", func() {
 
  Context("when tracing is configured", func() {
  BeforeEach(func() {
- tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
+ exporter := tracetest.NewInMemoryExporter()
+ tp := trace.NewTracerProvider(trace.WithSyncer(exporter))
+ tracing.ConfigureTraceProvider(tp)
  })
 
  AfterEach(func() {

atc/db/prototype_test.go

@@ -10,7 +10,8 @@ import (
  "github.com/concourse/concourse/tracing"
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
- "go.opentelemetry.io/otel/oteltest"
+ sdktrace "go.opentelemetry.io/otel/sdk/trace"
+ "go.opentelemetry.io/otel/sdk/trace/tracetest"
  "go.opentelemetry.io/otel/trace"
 )
 
@@ -287,7 +288,9 @@ var _ = Describe("Prototype", func() {
  var span trace.Span
 
  BeforeEach(func() {
- tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
+ exporter := tracetest.NewInMemoryExporter()
+ tp := sdktrace.NewTracerProvider(sdktrace.WithSyncer(exporter))
+ tracing.ConfigureTraceProvider(tp)
 
  ctx, span = tracing.StartSpan(context.Background(), "fake-operation", nil)
  })

atc/db/resource_test.go

@@ -15,7 +15,8 @@ import (
  "github.com/concourse/concourse/tracing"
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
- "go.opentelemetry.io/otel/oteltest"
+ sdktrace "go.opentelemetry.io/otel/sdk/trace"
+ "go.opentelemetry.io/otel/sdk/trace/tracetest"
  "go.opentelemetry.io/otel/trace"
 )
 
@@ -526,7 +527,9 @@ var _ = Describe("Resource", func() {
  var span trace.Span
 
  BeforeEach(func() {
- tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
+ exporter := tracetest.NewInMemoryExporter()
+ tp := sdktrace.NewTracerProvider(sdktrace.WithSyncer(exporter))
+ tracing.ConfigureTraceProvider(tp)
 
  ctx, span = tracing.StartSpan(context.Background(), "fake-operation", nil)
  })
@@ -633,7 +636,9 @@ var _ = Describe("Resource", func() {
  var span trace.Span
 
  BeforeEach(func() {
- tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
+ exporter := tracetest.NewInMemoryExporter()
+ tp := sdktrace.NewTracerProvider(sdktrace.WithSyncer(exporter))
+ tracing.ConfigureTraceProvider(tp)
 
  ctx, span = tracing.StartSpan(context.Background(), "fake-operation", nil)
  })

atc/db/resource_type_test.go

@@ -11,7 +11,8 @@ import (
  "github.com/concourse/concourse/tracing"
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
- "go.opentelemetry.io/otel/oteltest"
+ sdktrace "go.opentelemetry.io/otel/sdk/trace"
+ "go.opentelemetry.io/otel/sdk/trace/tracetest"
  "go.opentelemetry.io/otel/trace"
 )
 
@@ -450,7 +451,9 @@ var _ = Describe("ResourceType", func() {
  var span trace.Span
 
  BeforeEach(func() {
- tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
+ exporter := tracetest.NewInMemoryExporter()
+ tp := sdktrace.NewTracerProvider(sdktrace.WithSyncer(exporter))
+ tracing.ConfigureTraceProvider(tp)
 
  ctx, span = tracing.StartSpan(context.Background(), "fake-operation", nil)
  })

atc/exec/check_step_test.go

@@ -21,7 +21,8 @@ import (
  "github.com/concourse/concourse/atc/worker"
  "github.com/concourse/concourse/tracing"
  "github.com/concourse/concourse/vars"
- "go.opentelemetry.io/otel/oteltest"
+ sdktrace "go.opentelemetry.io/otel/sdk/trace"
+ "go.opentelemetry.io/otel/sdk/trace/tracetest"
  "go.opentelemetry.io/otel/trace"
 
  . "github.com/onsi/ginkgo/v2"
@@ -142,7 +143,7 @@ var _ = Describe("CheckStep", func() {
  var err error
  _, noInputStrategy, checkStrategy, err = worker.NewPlacementStrategy(worker.PlacementOptions{
  NoInputStrategies: []string{},
- CheckStrategies: []string{},
+ CheckStrategies:  []string{},
  })
  Expect(err).ToNot(HaveOccurred())
  })
@@ -566,7 +567,9 @@ var _ = Describe("CheckStep", func() {
 
  Context("when tracing is enabled", func() {
  BeforeEach(func() {
- tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
+ exporter := tracetest.NewInMemoryExporter()
+ tp := sdktrace.NewTracerProvider(sdktrace.WithSyncer(exporter))
+ tracing.ConfigureTraceProvider(tp)
 
  spanCtx, buildSpan := tracing.StartSpan(ctx, "build", nil)
  fakeDelegate.StartSpanReturns(spanCtx, buildSpan)
@@ -594,7 +597,9 @@ var _ = Describe("CheckStep", func() {
  var buildSpan trace.Span
 
  BeforeEach(func() {
- tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
+ exporter := tracetest.NewInMemoryExporter()
+ tp := sdktrace.NewTracerProvider(sdktrace.WithSyncer(exporter))
+ tracing.ConfigureTraceProvider(tp)
 
  spanCtx, buildSpan = tracing.StartSpan(context.Background(), "fake-operation", nil)
  fakeDelegate.StartSpanReturns(spanCtx, buildSpan)

atc/exec/get_step_test.go

@@ -22,7 +22,8 @@ import (
  "github.com/concourse/concourse/tracing"
  "github.com/concourse/concourse/vars"
  "github.com/onsi/gomega/gbytes"
- "go.opentelemetry.io/otel/oteltest"
+ "go.opentelemetry.io/otel/sdk/trace"
+ "go.opentelemetry.io/otel/sdk/trace/tracetest"
 
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
@@ -215,7 +216,9 @@ var _ = Describe("GetStep", func() {
 
  Context("when tracing is enabled", func() {
  BeforeEach(func() {
- tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
+ exporter := tracetest.NewInMemoryExporter()
+ tp := trace.NewTracerProvider(trace.WithSyncer(exporter))
+ tracing.ConfigureTraceProvider(tp)
 
  spanCtx, buildSpan := tracing.StartSpan(ctx, "build", nil)
  fakeDelegate.StartSpanReturns(spanCtx, buildSpan)

atc/exec/put_step_test.go

@@ -11,7 +11,8 @@ import (
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
  "github.com/onsi/gomega/gbytes"
- "go.opentelemetry.io/otel/oteltest"
+ "go.opentelemetry.io/otel/sdk/trace"
+ "go.opentelemetry.io/otel/sdk/trace/tracetest"
 
  "github.com/concourse/concourse/atc"
  "github.com/concourse/concourse/atc/db"
@@ -566,7 +567,9 @@ var _ = Describe("PutStep", func() {
 
  Context("when tracing is enabled", func() {
  BeforeEach(func() {
- tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
+ exporter := tracetest.NewInMemoryExporter()
+ tp := trace.NewTracerProvider(trace.WithSyncer(exporter))
+ tracing.ConfigureTraceProvider(tp)
 
  spanCtx, buildSpan := tracing.StartSpan(ctx, "build", nil)
  fakeDelegate.StartSpanReturns(spanCtx, buildSpan)

atc/exec/task_step_test.go

@@ -17,7 +17,8 @@ import (
  "github.com/concourse/concourse/tracing"
  "github.com/concourse/concourse/vars"
  "github.com/onsi/gomega/gbytes"
- "go.opentelemetry.io/otel/oteltest"
+ "go.opentelemetry.io/otel/sdk/trace"
+ "go.opentelemetry.io/otel/sdk/trace/tracetest"
 
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
@@ -366,7 +367,9 @@ var _ = Describe("TaskStep", func() {
  Context("when tracing is enabled", func() {
  BeforeEach(func() {
  defaultTaskTimeout = 0
- tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
+ exporter := tracetest.NewInMemoryExporter()
+ tp := trace.NewTracerProvider(trace.WithSyncer(exporter))
+ tracing.ConfigureTraceProvider(tp)
 
  spanCtx, buildSpan := tracing.StartSpan(ctx, "build", nil)
  fakeDelegate.StartSpanReturns(spanCtx, buildSpan)