Merge branch 'GoogleCloudPlatform:main' into feat/application-integra…

…tion

.ci/containers/build-environment/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Building Go dependencies
-FROM golang:1.20-bullseye AS builder
+FROM golang:1.21-bullseye AS builder
 
 # Set working directory
 WORKDIR /app
@@ -15,7 +15,7 @@ RUN go mod download
 FROM ruby:3.1-bullseye
 
 # golang
-COPY --from=golang:1.20-bullseye /usr/local/go /usr/local/go
+COPY --from=golang:1.21-bullseye /usr/local/go /usr/local/go
 ENV GOPATH /go
 ENV PATH /usr/local/go/bin:$PATH
 ENV PATH $GOPATH/bin:$PATH

.ci/containers/go-plus/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Download go module cache for builds
-FROM golang:1.20-bullseye AS builder
+FROM golang:1.21-bullseye AS builder
 ENV GOCACHE=/go/cache
 
 RUN apt-get update && apt-get install -y unzip
@@ -12,7 +12,7 @@ WORKDIR /app1/magic-modules-main/.ci/magician
 RUN go build -o /dev/null .
 
 # Stage 2: Creating the final image
-FROM golang:1.20-bullseye
+FROM golang:1.21-bullseye
 SHELL ["/bin/bash", "-c"]
 ENV GOCACHE=/go/cache
 

.ci/magician/cmd/DIFF_COMMENT.md

@@ -0,0 +1,36 @@
+Hi there, I'm the Modular magician. I've detected the following information about your changes:
+
+## Diff report
+{{ $diffsLength := len .Diffs }}{{if eq $diffsLength 0 }}
+Your PR hasn't generated any diffs, but I'll let you know if a future commit does.
+{{else}}
+Your PR generated some diffs in downstreams - here they are.
+
+{{range .Diffs -}}
+{{.Title}}: [Diff](https://github.com/modular-magician/{{.Repo}}/compare/auto-pr-{{$.PrNumber}}-old..auto-pr-{{$.PrNumber}}) ({{.DiffStats}})
+{{end -}}
+{{end -}}
+
+{{- $breakingChangesLength := len .BreakingChanges }}
+{{- if gt $breakingChangesLength 0}}
+## Breaking Change(s) Detected
+
+The following breaking change(s) were detected within your pull request.
+
+{{- range .BreakingChanges}}
+- {{.}}{{end}}
+
+If you believe this detection to be incorrect please raise the concern with your reviewer.
+If you intend to make this change you will need to wait for a [major release](https://www.terraform.io/plugin/sdkv2/best-practices/versioning#example-major-number-increments) window.
+An `override-breaking-change` label can be added to allow merging.
+{{end}}
+{{.MissingTests}}
+{{- $errorsLength := len .Errors}}
+{{- if gt $errorsLength 0}}
+## Errors
+{{range .Errors}}
+{{.Title}}:
+{{- range .Errors}}
+- {{.}}{{end}}
+{{end}}
+{{- end -}}