Implement fix for sles linux integ-test #278
Open
Conversation
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
SaxyPandaBear
previously approved these changes
Jun 26, 2023
| dims []types.Dimension | ||
| failed []dimension.Instruction | ||
| ) | ||
| log.Println(fmt.Sprintf("OS VERSION IS %s", m.env.OS)) |
There was a problem hiding this comment.
Why not just
Suggested change
| log.Println(fmt.Sprintf("OS VERSION IS %s", m.env.OS)) | |
| log.Printf("OS VERSION IS %s\n", m.env.OS) |
| failed []dimension.Instruction | ||
| ) | ||
| log.Println(fmt.Sprintf("OS VERSION IS %s", m.env.OS)) | ||
| if strings.Contains(m.env.OS, "sles") { |
There was a problem hiding this comment.
nit - I'd prefer to use HasPrefix
Comment on lines
+78
to
+89
| } else { | ||
| dims, failed = m.DimensionFactory.GetDimensions([]dimension.Instruction{ | ||
| { | ||
| Key: "interface", | ||
| Value: dimension.ExpectedDimensionValue{aws.String("docker0")}, | ||
| }, | ||
| { | ||
| Key: "InstanceId", | ||
| Value: dimension.UnknownDimensionValue(), | ||
| }, | ||
| }) | ||
| } |
There was a problem hiding this comment.
Frankly we could consolidate this since the only thing that differs is the name of the expected dimension.
var dimName string
if strings.HasPrefix(m.env.OS, "sles") {
dimName = "eth0"
} else {
dimName = "docker0"
}
dims, failed = m.DimensionFactory.GetDimensions([]dimension.Instruction{
{
Key: "interface",
Value: dimension.ExpectedDimensionValue{&dimName},
},
{
Key: "InstanceId",
Value: dimension.UnknownDimensionValue(),
},
})
|
I was curious how the other tests are working with the docker0 interface since that isnt something available typically by default. And just noticed we have a docker component baked into our AMIs - which is missing from the SLES ones. So we should update those and not need these OS level overrides in code. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of the issue
EC2 Linux SLES integ-tests were failing due to the test checking for the
docker0interface dimension for the net plugin on all EC2 instances.SLES versions of Linux do not publish net metrics to
docker0. They only publish to theeth0interface dimension.Description of changes
This change passes the OS using terraform, allowing us to check for the
eth0dimension when it's an SLES version of LinuxLicense
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Tests
Successfully tested by running the workflow