Skip to content
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

chore: fix typo in e2e #710

Merged
merged 1 commit into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/e2e/framework/types/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ func (j *Job) validateStep(step *StepWrapper) error {

var err error
var value string
if step.Opts.SkipSavingParamatersToJob {
if step.Opts.SkipSavingParametersToJob {
retrievedvalue := j.GetValues(step, parameter)

// if the value is already set, and it's not the same as the one we're trying to set, error
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/framework/types/scenarios_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestScenarioValuesWithSkip(t *testing.T) {
Parameter1: "Top Level Step 1",
Parameter2: "Top Level Step 2",
}, &StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
})

// top level step skips saving parameters, so we should error here
Expand Down Expand Up @@ -100,7 +100,7 @@ func NewDummyScenarioWithSkipSave() *Scenario {
Parameter1: "",
Parameter2: "",
}, Opts: &StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
)
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/framework/types/step.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var DefaultOpts = StepOptions{
// when wanting to avoid saving the parameters to the job,
// such as a repetetive task where step is used multiple times sequentially,
// but parameters are different each time
SkipSavingParamatersToJob: false,
SkipSavingParametersToJob: false,
}

type Step interface {
Expand All @@ -32,7 +32,7 @@ type StepOptions struct {
// a step, but you don't want to save the parameters
// ex: Sleep for 15 seconds, then Sleep for 10 seconds,
// you don't want to save the parameters
SkipSavingParamatersToJob bool
SkipSavingParametersToJob bool

// Will save this step to the job's steps
// and then later on when Stop is called with job name,
Expand Down
24 changes: 12 additions & 12 deletions test/e2e/scenarios/dns/scenarios.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams,
},
Opts: &types.StepOptions{
ExpectError: req.ExpectError,
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -73,7 +73,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams,
},
Opts: &types.StepOptions{
ExpectError: req.ExpectError,
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -91,7 +91,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams,
OptionalLabelAffinity: "app=" + agnhostName, // port forward to a pod on a node that also has this pod with this label, assuming same namespace
},
Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
RunInBackgroundWithID: id,
},
},
Expand All @@ -101,7 +101,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams,
QueryType: req.QueryType,
},
Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -113,7 +113,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams,
Response: resp.Response,
},
Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -127,7 +127,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams,
ResourceName: agnhostName,
ResourceNamespace: "kube-system",
}, Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand Down Expand Up @@ -160,7 +160,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam
},
Opts: &types.StepOptions{
ExpectError: req.ExpectError,
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -177,7 +177,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam
},
Opts: &types.StepOptions{
ExpectError: req.ExpectError,
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -195,7 +195,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam
OptionalLabelAffinity: "app=" + agnhostName, // port forward to a pod on a node that also has this pod with this label, assuming same namespace
},
Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
RunInBackgroundWithID: id,
},
},
Expand All @@ -210,7 +210,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam
KubeConfigFilePath: kubeConfigFilePath,
},
Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -227,7 +227,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam
KubeConfigFilePath: kubeConfigFilePath,
},
Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -241,7 +241,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam
ResourceName: agnhostName,
ResourceNamespace: "kube-system",
}, Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/scenarios/drop/scenario.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func ValidateDropMetric() *types.Scenario {
},
Opts: &types.StepOptions{
ExpectError: true,
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -54,7 +54,7 @@ func ValidateDropMetric() *types.Scenario {
},
Opts: &types.StepOptions{
ExpectError: true,
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand Down Expand Up @@ -91,7 +91,7 @@ func ValidateDropMetric() *types.Scenario {
ResourceName: "deny-all",
ResourceNamespace: "kube-system",
}, Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -100,7 +100,7 @@ func ValidateDropMetric() *types.Scenario {
ResourceName: "agnhost-a",
ResourceNamespace: "kube-system",
}, Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
}
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/scenarios/latency/scenario.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ func ValidateLatencyMetric() *types.Scenario {
OptionalLabelAffinity: "k8s-app=retina",
},
Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
RunInBackgroundWithID: "latency-port-forward",
},
},
{
Step: &ValidateAPIServerLatencyMetric{},
Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/scenarios/tcp/scenario.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func ValidateTCPMetrics() *types.Scenario {
PodNamespace: "kube-system",
Command: "curl -s -m 5 bing.com",
}, Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -50,7 +50,7 @@ func ValidateTCPMetrics() *types.Scenario {
PodNamespace: "kube-system",
Command: "curl -s -m 5 bing.com",
}, Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -63,22 +63,22 @@ func ValidateTCPMetrics() *types.Scenario {
OptionalLabelAffinity: "app=agnhost-a", // port forward to a pod on a node that also has this pod with this label, assuming same namespace
},
Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
RunInBackgroundWithID: "drop-flow-forward",
},
},
{
Step: &ValidateRetinaTCPStateMetric{
PortForwardedRetinaPort: "10093",
}, Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Step: &ValidateRetinaTCPConnectionRemoteMetric{
PortForwardedRetinaPort: "10093",
}, Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
{
Expand All @@ -92,7 +92,7 @@ func ValidateTCPMetrics() *types.Scenario {
ResourceName: "agnhost-a",
ResourceNamespace: "kube-system",
}, Opts: &types.StepOptions{
SkipSavingParamatersToJob: true,
SkipSavingParametersToJob: true,
},
},
}
Expand Down
Loading