diff --git a/test/e2e/framework/types/job.go b/test/e2e/framework/types/job.go index 5bae546dd0..38b7194ab9 100644 --- a/test/e2e/framework/types/job.go +++ b/test/e2e/framework/types/job.go @@ -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 diff --git a/test/e2e/framework/types/scenarios_test.go b/test/e2e/framework/types/scenarios_test.go index f6d0768e8e..982dc915dc 100644 --- a/test/e2e/framework/types/scenarios_test.go +++ b/test/e2e/framework/types/scenarios_test.go @@ -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 @@ -100,7 +100,7 @@ func NewDummyScenarioWithSkipSave() *Scenario { Parameter1: "", Parameter2: "", }, Opts: &StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, ) diff --git a/test/e2e/framework/types/step.go b/test/e2e/framework/types/step.go index dd14f2bcd1..2d0d795f75 100644 --- a/test/e2e/framework/types/step.go +++ b/test/e2e/framework/types/step.go @@ -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 { @@ -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, diff --git a/test/e2e/scenarios/dns/scenarios.go b/test/e2e/scenarios/dns/scenarios.go index 4d350946fb..4e6eb6d5be 100644 --- a/test/e2e/scenarios/dns/scenarios.go +++ b/test/e2e/scenarios/dns/scenarios.go @@ -56,7 +56,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams, }, Opts: &types.StepOptions{ ExpectError: req.ExpectError, - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -73,7 +73,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams, }, Opts: &types.StepOptions{ ExpectError: req.ExpectError, - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -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, }, }, @@ -101,7 +101,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams, QueryType: req.QueryType, }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -113,7 +113,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams, Response: resp.Response, }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -127,7 +127,7 @@ func ValidateBasicDNSMetrics(scenarioName string, req *RequestValidationParams, ResourceName: agnhostName, ResourceNamespace: "kube-system", }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -160,7 +160,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam }, Opts: &types.StepOptions{ ExpectError: req.ExpectError, - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -177,7 +177,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam }, Opts: &types.StepOptions{ ExpectError: req.ExpectError, - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -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, }, }, @@ -210,7 +210,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam KubeConfigFilePath: kubeConfigFilePath, }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -227,7 +227,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam KubeConfigFilePath: kubeConfigFilePath, }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -241,7 +241,7 @@ func ValidateAdvancedDNSMetrics(scenarioName string, req *RequestValidationParam ResourceName: agnhostName, ResourceNamespace: "kube-system", }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { diff --git a/test/e2e/scenarios/drop/scenario.go b/test/e2e/scenarios/drop/scenario.go index cbd710661b..fb44d38c3b 100644 --- a/test/e2e/scenarios/drop/scenario.go +++ b/test/e2e/scenarios/drop/scenario.go @@ -38,7 +38,7 @@ func ValidateDropMetric() *types.Scenario { }, Opts: &types.StepOptions{ ExpectError: true, - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -54,7 +54,7 @@ func ValidateDropMetric() *types.Scenario { }, Opts: &types.StepOptions{ ExpectError: true, - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -91,7 +91,7 @@ func ValidateDropMetric() *types.Scenario { ResourceName: "deny-all", ResourceNamespace: "kube-system", }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -100,7 +100,7 @@ func ValidateDropMetric() *types.Scenario { ResourceName: "agnhost-a", ResourceNamespace: "kube-system", }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, } diff --git a/test/e2e/scenarios/latency/scenario.go b/test/e2e/scenarios/latency/scenario.go index ee759e3e59..b400ffadf3 100644 --- a/test/e2e/scenarios/latency/scenario.go +++ b/test/e2e/scenarios/latency/scenario.go @@ -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, }, }, { diff --git a/test/e2e/scenarios/tcp/scenario.go b/test/e2e/scenarios/tcp/scenario.go index f4759e7753..25a4928f53 100644 --- a/test/e2e/scenarios/tcp/scenario.go +++ b/test/e2e/scenarios/tcp/scenario.go @@ -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, }, }, { @@ -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, }, }, { @@ -63,7 +63,7 @@ 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", }, }, @@ -71,14 +71,14 @@ func ValidateTCPMetrics() *types.Scenario { Step: &ValidateRetinaTCPStateMetric{ PortForwardedRetinaPort: "10093", }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { Step: &ValidateRetinaTCPConnectionRemoteMetric{ PortForwardedRetinaPort: "10093", }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, { @@ -92,7 +92,7 @@ func ValidateTCPMetrics() *types.Scenario { ResourceName: "agnhost-a", ResourceNamespace: "kube-system", }, Opts: &types.StepOptions{ - SkipSavingParamatersToJob: true, + SkipSavingParametersToJob: true, }, }, }