Skip to content

Commit

Permalink
fixing file format
Browse files Browse the repository at this point in the history
  • Loading branch information
Paramadon committed Nov 19, 2024
1 parent 5dc40f4 commit 0ecdd85
Show file tree
Hide file tree
Showing 371 changed files with 55,274 additions and 18,943 deletions.
9 changes: 4 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Describe the bug**
Expand All @@ -29,4 +28,4 @@ Config: (e.g. the agent json config file)
OS: (e.g., "Ubuntu 20.04")

**Additional context**
Add any other context about the problem here.
Add any other context about the problem here.
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
18 changes: 9 additions & 9 deletions .github/config/file-filters.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
lint:
- '**/*.go'
- '**/*.sh'
- '.golangci.yml'
- 'packaging/**'
- "**/*.go"
- "**/*.sh"
- ".golangci.yml"
- "packaging/**"

build:
- 'Makefile'
- 'go.sum'
- '!({.github,amazon-cloudwatch-container-insights})/**/*.{yml,yaml}'
- '.github/workflows/PR-build.yml'
- '**/*.{go,toml,json,conf}'
- "Makefile"
- "go.sum"
- "!({.github,amazon-cloudwatch-container-insights})/**/*.{yml,yaml}"
- ".github/workflows/PR-build.yml"
- "**/*.{go,toml,json,conf}"
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "weekly"
10 changes: 6 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
# Description of the issue

_Describe the problem or feature in addition to a link to the issues._

# Description of changes

_How does this change address the problem?_

# License

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

# Tests

_Describe what tests you have done._

# Requirements

_Before commit the code, please do the following steps._

1. Run `make fmt` and `make fmt-sh`
2. Run `make lint`




9 changes: 4 additions & 5 deletions .github/workflows/PR-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ name: PR Build
on:
workflow_dispatch:
pull_request:
branches:
branches:
- main*
- feature*
types:
types:
- opened
- synchronize
- reopened
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-2019, windows-latest, macos-12]
os: [ubuntu-latest, windows-2019, windows-latest, macos-12]
include:
- os: ubuntu-latest
family: linux
Expand Down Expand Up @@ -130,10 +130,9 @@ jobs:
run: choco install make

- name: Unit Test
if: steps.cached_binaries.outputs.cache-hit != 'true' && needs.changes.outputs.build == 'true'
if: steps.cached_binaries.outputs.cache-hit != 'true' && needs.changes.outputs.build == 'true'
run: make test

- name: Build
if: steps.cached_binaries.outputs.cache-hit != 'true' && needs.changes.outputs.build == 'true'
run: make amazon-cloudwatch-agent-${{ matrix.family }}

73 changes: 36 additions & 37 deletions .github/workflows/application-signals-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ on:
workflow_dispatch:
inputs:
build_run_id:
description: 'The ID of the build-test-artifacts workflow run'
description: "The ID of the build-test-artifacts workflow run"
type: number
required: true
build_sha:
description: 'The SHA of the build-test-artifacts workflow run'
description: "The SHA of the build-test-artifacts workflow run"
type: string
required: true

Expand All @@ -25,7 +25,6 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
cancel-in-progress: true


jobs:
CheckBuildTestArtifacts:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -54,129 +53,129 @@ jobs:
secrets: inherit
with:
aws-region: us-east-1
test-cluster-name: 'e2e-cw-agent-test'
caller-workflow-name: 'main-build'
test-cluster-name: "e2e-cw-agent-test"
caller-workflow-name: "main-build"

java-ec2-default-e2e-test:
needs: CheckBuildTestArtifacts
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

java-ec2-asg-e2e-test:
needs: [ CheckBuildTestArtifacts ]
needs: [CheckBuildTestArtifacts]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

java-metric-limiter-e2e-test:
needs: [ CheckBuildTestArtifacts, java-eks-e2e-test ]
needs: [CheckBuildTestArtifacts, java-eks-e2e-test]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
test-cluster-name: 'e2e-cw-agent-test'
caller-workflow-name: 'main-build'
test-cluster-name: "e2e-cw-agent-test"
caller-workflow-name: "main-build"

java-k8s-e2e-test:
needs: [ CheckBuildTestArtifacts ]
needs: [CheckBuildTestArtifacts]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

java-ecs-e2e-test:
needs: [ CheckBuildTestArtifacts ]
needs: [CheckBuildTestArtifacts]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ecs-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

python-eks-e2e-test:
needs: [ CheckBuildTestArtifacts, java-metric-limiter-e2e-test ]
needs: [CheckBuildTestArtifacts, java-metric-limiter-e2e-test]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
test-cluster-name: 'e2e-cw-agent-test'
caller-workflow-name: 'main-build'
test-cluster-name: "e2e-cw-agent-test"
caller-workflow-name: "main-build"

python-ec2-default-e2e-test:
needs: [ CheckBuildTestArtifacts ]
needs: [CheckBuildTestArtifacts]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

python-ec2-asg-e2e-test:
needs: [ CheckBuildTestArtifacts ]
needs: [CheckBuildTestArtifacts]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-asg-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

python-k8s-e2e-test:
needs: [ CheckBuildTestArtifacts, java-k8s-e2e-test ]
needs: [CheckBuildTestArtifacts, java-k8s-e2e-test]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-k8s-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

python-ecs-e2e-test:
needs: [ CheckBuildTestArtifacts ]
needs: [CheckBuildTestArtifacts]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ecs-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

node-eks-e2e-test:
# Because we share the same eks cluster for different languages, we want to run the tests sequentially to avoid interference
needs: [ CheckBuildTestArtifacts, python-eks-e2e-test ]
needs: [CheckBuildTestArtifacts, python-eks-e2e-test]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/node-eks-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
test-cluster-name: 'e2e-cw-agent-test'
caller-workflow-name: 'main-build'
test-cluster-name: "e2e-cw-agent-test"
caller-workflow-name: "main-build"

node-ec2-default-e2e-test:
needs: [ CheckBuildTestArtifacts ]
needs: [CheckBuildTestArtifacts]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/node-ec2-default-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

node-ec2-asg-e2e-test:
needs: [ CheckBuildTestArtifacts ]
needs: [CheckBuildTestArtifacts]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/node-ec2-asg-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

node-k8s-e2e-test:
needs: [ CheckBuildTestArtifacts ]
needs: [CheckBuildTestArtifacts]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/node-k8s-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"

node-ecs-e2e-test:
needs: [ CheckBuildTestArtifacts ]
needs: [CheckBuildTestArtifacts]
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/node-ecs-test.yml@main
secrets: inherit
with:
aws-region: us-east-1
caller-workflow-name: 'main-build'
caller-workflow-name: "main-build"
32 changes: 22 additions & 10 deletions .github/workflows/build-test-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ on:
branches:
- main*
paths-ignore:
- '**/*.md'
- 'NOTICE'
- 'THIRD-PARTY'
- 'LICENSE'
- '.github/**'
- '!.github/workflows/build-test-artifacts.yml'
- '!.github/workflows/integration-test.yml'
- '!.github/workflows/application-signals-e2e-test.yml'
- "**/*.md"
- "NOTICE"
- "THIRD-PARTY"
- "LICENSE"
- ".github/**"
- "!.github/workflows/build-test-artifacts.yml"
- "!.github/workflows/integration-test.yml"
- "!.github/workflows/application-signals-e2e-test.yml"
workflow_dispatch:

concurrency:
Expand Down Expand Up @@ -86,15 +86,27 @@ jobs:
Bucket: ${{ vars.S3_INTEGRATION_BUCKET_CN }}

StartIntegrationTests:
needs: [ BuildAndUploadPackages, BuildAndUploadITAR, BuildAndUploadCN, BuildDocker ]
needs:
[
BuildAndUploadPackages,
BuildAndUploadITAR,
BuildAndUploadCN,
BuildDocker,
]
runs-on: ubuntu-latest
steps:
- run: gh workflow run integration-test.yml --ref ${{ github.ref_name }} --repo $GITHUB_REPOSITORY -f build_run_id=${{ github.run_id }} -f build_sha=${{ github.sha }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

StartApplicationSignalsE2ETests:
needs: [ BuildAndUploadPackages, BuildAndUploadITAR, BuildAndUploadCN, BuildDocker ]
needs:
[
BuildAndUploadPackages,
BuildAndUploadITAR,
BuildAndUploadCN,
BuildDocker,
]
# Workflow only runs against main
if: ${{ contains(github.ref_name, 'main') }}
runs-on: ubuntu-latest
Expand Down
Loading

0 comments on commit 0ecdd85

Please sign in to comment.