Skip to content

Commit 8b76013

Browse files
hannahkmhannahkm
authored
Merge branch 'main' into rarguelloF/fix-gorm-service-name
2 parents 7469c18 + 0e06d9c commit 8b76013

122 files changed

Lines changed: 4938 additions & 493 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
# https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github
33
**/go.sum linguist-generated
44
go.work.sum linguist-generated
5+
contrib/azure/apim-callout/deploy/azure/azuredeploy.json linguist-generated

‎.github/workflows/apps/go.sum‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/docker-images-release.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
- 'contrib/envoyproxy/go-control-plane/v[0-9]+.[0-9]+.[0-9]+-docker.[0-9]+'
88
- 'contrib/k8s.io/gateway-api/v[0-9]+.[0-9]+.[0-9]+'
99
- 'contrib/k8s.io/gateway-api/v[0-9]+.[0-9]+.[0-9]+-docker.[0-9]+'
10+
- 'contrib/azure/apim-callout/v[0-9]+.[0-9]+.[0-9]+'
11+
- 'contrib/azure/apim-callout/v[0-9]+.[0-9]+.[0-9]+-docker.[0-9]+'
1012
- 'contrib/haproxy/stream-processing-offload/v[0-9]+.[0-9]+.[0-9]+'
1113
- 'contrib/haproxy/stream-processing-offload/v[0-9]+.[0-9]+.[0-9]+-docker.[0-9]+'
1214
workflow_dispatch:
@@ -32,6 +34,11 @@ on:
3234
required: false
3335
default: false
3436
type: boolean
37+
build_apim_callout:
38+
description: 'Build APIM callout image'
39+
required: false
40+
default: false
41+
type: boolean
3542
build_haproxy:
3643
description: 'Build haproxy SPOA image'
3744
required: false
@@ -46,6 +53,7 @@ jobs:
4653
prepare-tag:
4754
runs-on: ubuntu-latest
4855
outputs:
56+
apim_callout_image_tag: ${{ steps.extract.outputs.apim_callout_image_tag }}
4957
service_extension_image_tag: ${{ steps.extract.outputs.service_extension_image_tag }}
5058
request_mirroring_image_tag: ${{ steps.extract.outputs.request_mirroring_image_tag }}
5159
haproxy_image_tag: ${{ steps.extract.outputs.haproxy_image_tag }}
@@ -54,16 +62,34 @@ jobs:
5462
id: extract
5563
env:
5664
RAW_TAG: ${{ github.event.inputs.tag_name || github.ref_name }}
65+
PREFIX_APIM_CALLOUT: contrib/azure/apim-callout/
5766
PREFIX_SERVICE_EXTENSION: contrib/envoyproxy/go-control-plane/
5867
PREFIX_REQUEST_MIRRORING: contrib/k8s.io/gateway-api/
5968
PREFIX_HAPROXY: contrib/haproxy/stream-processing-offload/
6069
run: |
6170
{
71+
echo "apim_callout_image_tag=${RAW_TAG#"$PREFIX_APIM_CALLOUT"}"
6272
echo "service_extension_image_tag=${RAW_TAG#"$PREFIX_SERVICE_EXTENSION"}"
6373
echo "request_mirroring_image_tag=${RAW_TAG#"$PREFIX_REQUEST_MIRRORING"}"
6474
echo "haproxy_image_tag=${RAW_TAG#"$PREFIX_HAPROXY"}"
6575
} >> "$GITHUB_OUTPUT"
6676
77+
build-apim-callout:
78+
needs: prepare-tag
79+
if: >
80+
github.event_name == 'push' && startsWith(github.ref, 'refs/tags/contrib/azure/apim-callout')
81+
|| github.event.inputs.build_apim_callout == 'true'
82+
uses: ./.github/workflows/docker-build-and-push.yml
83+
with:
84+
image: ghcr.io/datadog/dd-trace-go/apim-callout
85+
dockerfile: ./contrib/azure/apim-callout/cmd/apim-callout/Dockerfile
86+
artifact_prefix: apim-callout
87+
commit_sha: ${{ github.event.inputs.commit_sha || github.sha }}
88+
version: ${{ needs.prepare-tag.outputs.apim_callout_image_tag }}
89+
tags: >-
90+
${{ needs.prepare-tag.outputs.apim_callout_image_tag }}
91+
${{ (github.event.inputs.set_as_latest == 'true' || github.event_name == 'push') && 'latest' || '' }}
92+
6793
build-service-extensions-callout:
6894
needs: prepare-tag
6995
if: >

‎.github/workflows/system-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ jobs:
301301
id: dd-sts
302302
uses: DataDog/dd-sts-action@2e8187910199bd93129520183c093e19aa585c75
303303
with:
304-
policy: dd-trace-go
304+
policy: dd-trace-go-app-key
305305

306306
- name: Build runner
307307
uses: ./.github/actions/install_runner

‎CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/instrumentation/appsec @DataDog/asm-go
1717
/contrib/**/*appsec*.go @DataDog/asm-go
1818
/.github/workflows/appsec.yml @DataDog/asm-go
19+
/contrib/azure @DataDog/asm-go
1920
/contrib/envoyproxy @DataDog/asm-go
2021
/contrib/haproxy @DataDog/asm-go
2122
/contrib/k8s.io/gateway-api @DataDog/asm-go

‎contrib/99designs/gqlgen/go.sum‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contrib/IBM/sarama/go.sum‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contrib/Shopify/sarama/go.sum‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contrib/aws/aws-sdk-go-v2/go.sum‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contrib/aws/aws-sdk-go/go.sum‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)