-
Notifications
You must be signed in to change notification settings - Fork 207
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Generate JSON File With Linux Test AMI X Tag #440
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| [ | ||
| { | ||
| "os": "ubuntu", | ||
| "username": "ubuntu", | ||
| "installAgentCommand": "sudo dpkg -i -E ./amazon-cloudwatch-agent.deb", | ||
| "ami": "cloudwatch-agent-integration-test-ubuntu*", | ||
| "caCertPath": "/etc/ssl/certs/ca-certificates.crt", | ||
| "arc": "amd64", "binaryName": "amazon-cloudwatch-agent.deb" | ||
| }, | ||
| { | ||
| "os": "al2", | ||
| "username": "ec2-user", | ||
| "installAgentCommand": "rpm -U ./amazon-cloudwatch-agent.rpm", | ||
| "ami": "cloudwatch-agent-integration-test-al2*", | ||
| "caCertPath": "/etc/ssl/certs/ca-bundle.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.rpm" | ||
| }, | ||
| { | ||
| "os": "rhel8", | ||
| "username": "ec2-user", | ||
| "installAgentCommand": "rpm -U ./amazon-cloudwatch-agent.rpm", | ||
| "ami": "cloudwatch-agent-integration-test-rhel8-base*", | ||
| "caCertPath": "/etc/ssl/certs/ca-bundle.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.rpm" | ||
| }, | ||
| { | ||
| "os": "rhel8-1", | ||
| "username": "ec2-user", | ||
| "installAgentCommand": "rpm -U ./amazon-cloudwatch-agent.rpm", | ||
| "ami": "cloudwatch-agent-integration-test-rhel8-1*", | ||
| "caCertPath": "/etc/ssl/certs/ca-bundle.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.rpm" | ||
| }, | ||
| { | ||
| "os": "rhel8-2", | ||
| "username": "ec2-user", | ||
| "installAgentCommand": "rpm -U ./amazon-cloudwatch-agent.rpm", | ||
| "ami": "cloudwatch-agent-integration-test-rhel8-2*", | ||
| "caCertPath": "/etc/ssl/certs/ca-bundle.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.rpm" | ||
| }, | ||
| { | ||
| "os": "rhel8-3", | ||
| "username": "ec2-user", | ||
| "installAgentCommand": "rpm -U ./amazon-cloudwatch-agent.rpm", | ||
| "ami": "cloudwatch-agent-integration-test-rhel8-3*", | ||
| "caCertPath": "/etc/ssl/certs/ca-bundle.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.rpm" | ||
| }, | ||
| { | ||
| "os": "rhel8-4", | ||
| "username": "ec2-user", | ||
| "installAgentCommand": "rpm -U ./amazon-cloudwatch-agent.rpm", | ||
| "ami": "cloudwatch-agent-integration-test-rhel8-4*", | ||
| "caCertPath": "/etc/ssl/certs/ca-bundle.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.rpm" | ||
| }, | ||
| { | ||
| "os": "ol8-1", | ||
| "username": "ec2-user", | ||
| "installAgentCommand": "rpm -U ./amazon-cloudwatch-agent.rpm", | ||
| "ami": "cloudwatch-agent-integration-test-ol8-1*", | ||
| "caCertPath": "/etc/ssl/certs/ca-bundle.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.rpm" | ||
| }, | ||
| { | ||
| "os": "ol8-2", | ||
| "username": "ec2-user", | ||
| "installAgentCommand": "rpm -U ./amazon-cloudwatch-agent.rpm", | ||
| "ami": "cloudwatch-agent-integration-test-ol8-2*", | ||
| "caCertPath": "/etc/ssl/certs/ca-bundle.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.rpm" | ||
| }, | ||
| { | ||
| "os": "ol8-3", | ||
| "username": "ec2-user", | ||
| "installAgentCommand": "rpm -U ./amazon-cloudwatch-agent.rpm", | ||
| "ami": "cloudwatch-agent-integration-test-ol8-3*", | ||
| "caCertPath": "/etc/ssl/certs/ca-bundle.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.rpm" | ||
| }, | ||
| { | ||
| "os": "ol8-4", | ||
| "username": "ec2-user", | ||
| "installAgentCommand": "rpm -U ./amazon-cloudwatch-agent.rpm", | ||
| "ami": "cloudwatch-agent-integration-test-ol8-4*", | ||
| "caCertPath": "/etc/ssl/certs/ca-bundle.crt", | ||
| "arc": "amd64", | ||
| "binaryName": "amazon-cloudwatch-agent.rpm" | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| [ | ||
| { | ||
|
|
||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| [ | ||
| { | ||
| "os": "win-2022", | ||
| "ami": "cloudwatch-agent-integration-test-win-2022*" | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
| ) | ||
|
|
||
| const ( | ||
| linux = "linux" | ||
| windows = "windows" | ||
| mac = "mac" | ||
| tag = "tag" | ||
| ) | ||
|
|
||
| //you can't have a const map in golang | ||
| var osToTagMap = map[string][]string{ | ||
| linux: {"integration"}, | ||
| windows: {}, | ||
| mac: {}, | ||
| } | ||
|
|
||
| func main() { | ||
| for osType, tags := range osToTagMap { | ||
| testMatrix := genMatrix(osType, tags) | ||
| writeTestMatrixFile(osType, testMatrix) | ||
| } | ||
| } | ||
|
|
||
| func genMatrix(targetOS string, tags []string) []map[string]string { | ||
| openTestMatrix, err := os.Open(fmt.Sprintf("integration/generator/resources/%v_test_matrix.json", targetOS)) | ||
| if err != nil { | ||
| panic(fmt.Sprintf("can't read file %v_test_matrix.json err %v", targetOS, err)) | ||
| } | ||
| byteValueTestMatrix, _ := ioutil.ReadAll(openTestMatrix) | ||
| _ = openTestMatrix.Close() | ||
| var testMatrix []map[string]string | ||
| err = json.Unmarshal([]byte(byteValueTestMatrix), &testMatrix) | ||
| if err != nil { | ||
| panic(fmt.Sprintf("can't unmarshall file %v_test_matrix.json err %v", targetOS, err)) | ||
| } | ||
|
|
||
| var testMatrixComplete []map[string]string | ||
| for _, test := range testMatrix { | ||
| testLine := copyMap(test) | ||
| for _, testTag := range tags { | ||
| testLine[tag] = testTag | ||
| } | ||
| testMatrixComplete = append(testMatrixComplete, testLine) | ||
| } | ||
| return testMatrixComplete | ||
| } | ||
|
|
||
| func writeTestMatrixFile(targetOS string, testMatrix []map[string]string) { | ||
| bytes, err := json.MarshalIndent(testMatrix, "", " ") | ||
| if err != nil { | ||
| panic(fmt.Sprintf("Can't marshal json for target os %v, err %v", targetOS, err)) | ||
| } | ||
| err = ioutil.WriteFile(fmt.Sprintf("integration/generator/resources/%v_complete_test_matrix.json", targetOS), bytes, os.ModePerm) | ||
| if err != nil { | ||
| panic(fmt.Sprintf("Can't write json to file for target os %v, err %v", targetOS, err)) | ||
| } | ||
| } | ||
|
|
||
| func copyMap(mapToCopy map[string]string) map[string]string { | ||
| testLine := make(map[string]string) | ||
| for key, value := range mapToCopy { | ||
| testLine[key] = value | ||
| } | ||
| return testLine | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We might want setting this as environment variable for easier change in go version for @ZhenyuTan-amz's upcoming PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We will just do a replace all with that pr.