fix(progress): remove redundant function argument

Signed-off-by: Boris Glimcher <[email protected]>

README.md

@@ -413,7 +413,7 @@ docker-compose up --build web
 ## Test HTTP server from agent
 
 ```text
-docker-compose run --rm -T agent curl --fail --key /private_key.pem --cert /my_cert.pem --cacert /opi.pem https://web:443/var/lib/
+docker-compose run --rm -T agent curl --fail --key /private_key.pem --cert /my_cert.pem --cacert /opi.pem https://web:443/
 ```
 
 OR

sztp-agent/pkg/secureagent/daemon.go

@@ -69,7 +69,7 @@
 	if err != nil {
 		return err
 	}
-	_ = a.doReportProgress(ProgressTypeBootstrapComplete, true)
+	_ = a.doReportProgress(ProgressTypeBootstrapComplete)
 	return nil
 }
 
@@ -92,7 +92,7 @@
 	return nil
 }
 
-func (a *Agent) doReportProgress(s ProgressType, needssh bool) error {
+func (a *Agent) doReportProgress(s ProgressType) error {
 	log.Println("[INFO] Starting the Report Progress request.")
 	url := strings.ReplaceAll(a.GetBootstrapURL(), "get-bootstrapping-data", "report-progress")
 	p := ProgressJSON{
@@ -110,7 +110,7 @@
 			Message:      "message sent via JSON",
 		},
 	}
-	if needssh {
+	if s == ProgressTypeBootstrapComplete {
 		// TODO: generate real key here
 		encodedKey := base64.StdEncoding.EncodeToString([]byte("mysshpass"))
 		p.IetfSztpBootstrapServerInput.SSHHostKeys = struct {
@@ -175,7 +175,7 @@
 		return err
 	}
 	log.Println("[INFO] Response retrieved successfully")
-	_ = a.doReportProgress(ProgressTypeBootstrapInitiated, false)
+	_ = a.doReportProgress(ProgressTypeBootstrapInitiated)
 	crypto := res.IetfSztpBootstrapServerOutput.ConveyedInformation
 	newVal, err := base64.StdEncoding.DecodeString(crypto)
 	if err != nil {
@@ -215,7 +215,7 @@
 //nolint:funlen
 func (a *Agent) downloadAndValidateImage() error {
 	log.Printf("[INFO] Starting the Download Image: %v", a.BootstrapServerOnboardingInfo.IetfSztpConveyedInfoOnboardingInformation.BootImage.DownloadURI)
-	_ = a.doReportProgress(ProgressTypeBootImageInitiated, false)
+	_ = a.doReportProgress(ProgressTypeBootImageInitiated)
 	// Download the image from DownloadURI and save it to a file
 	a.BootstrapServerOnboardingInfo.IetfSztpConveyedInfoOnboardingInformation.InfoTimestampReference = fmt.Sprintf("%8d", time.Now().Unix())
 	for i, item := range a.BootstrapServerOnboardingInfo.IetfSztpConveyedInfoOnboardingInformation.BootImage.DownloadURI {
@@ -239,7 +239,7 @@
 			},
 			Transport: &http.Transport{
 				TLSClientConfig: &tls.Config{ //nolint:gosec
 					InsecureSkipVerify: true, // TODO: remove skip verify
 					RootCAs:            caCertPool,
 					Certificates:       []tls.Certificate{cert},
 				},
@@ -300,7 +300,7 @@
 				return errors.New("Checksum mismatch")
 			}
 			log.Println("[INFO] Checksum verified successfully")
-			_ = a.doReportProgress(ProgressTypeBootImageComplete, false)
+			_ = a.doReportProgress(ProgressTypeBootImageComplete)
 			return nil
 		default:
 			return errors.New("Unsupported hash algorithm")
@@ -311,7 +311,7 @@
 
 func (a *Agent) copyConfigurationFile() error {
 	log.Println("[INFO] Starting the Copy Configuration.")
-	_ = a.doReportProgress(ProgressTypeConfigInitiated, false)
+	_ = a.doReportProgress(ProgressTypeConfigInitiated)
 	// Copy the configuration file to the device
 	file, err := os.Create(ARTIFACTS_PATH + a.BootstrapServerOnboardingInfo.IetfSztpConveyedInfoOnboardingInformation.InfoTimestampReference + "-config")
 	if err != nil {
@@ -330,13 +330,13 @@
 		log.Println("[ERROR] writing the configuration file", err.Error())
 		return err
 	}
 	err = os.Chmod(ARTIFACTS_PATH+a.BootstrapServerOnboardingInfo.IetfSztpConveyedInfoOnboardingInformation.InfoTimestampReference+"-config", 0744)
 	if err != nil {
 		log.Println("[ERROR] changing the configuration file permission", err.Error())
 		return err
 	}
 	log.Println("[INFO] Configuration file copied successfully")
-	_ = a.doReportProgress(ProgressTypeConfigComplete, false)
+	_ = a.doReportProgress(ProgressTypeConfigComplete)
 	return nil
 }
 
@@ -356,8 +356,8 @@
 		reportEnd = ProgressTypePreScriptComplete
 	}
 	log.Println("[INFO] Starting the " + scriptName + "-configuration.")
-	_ = a.doReportProgress(reportStart, false)
+	_ = a.doReportProgress(reportStart)
 	file, err := os.Create(ARTIFACTS_PATH + a.BootstrapServerOnboardingInfo.IetfSztpConveyedInfoOnboardingInformation.InfoTimestampReference + scriptName + "configuration.sh")
 	if err != nil {
 		log.Println("[ERROR] creating the "+scriptName+"-configuration script", err.Error())
 		return err
@@ -374,7 +374,7 @@
 		log.Println("[ERROR] writing the "+scriptName+"-configuration script", err.Error())
 		return err
 	}
 	err = os.Chmod(ARTIFACTS_PATH+a.BootstrapServerOnboardingInfo.IetfSztpConveyedInfoOnboardingInformation.InfoTimestampReference+scriptName+"configuration.sh", 0755)
 	if err != nil {
 		log.Println("[ERROR] changing the "+scriptName+"-configuration script permission", err.Error())
 		return err
@@ -387,7 +387,7 @@
 		return err
 	}
 	log.Println(string(out)) // remove it
-	_ = a.doReportProgress(reportEnd, false)
+	_ = a.doReportProgress(reportEnd)
 	log.Println("[INFO] " + scriptName + "-Configuration script executed successfully")
 	return nil
 }

sztp-agent/pkg/secureagent/daemon_test.go

@@ -88,7 +88,7 @@
 }
 
 func createTempTestFile(file string, ok bool) {
 	f, err := os.Create(file)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -412,7 +412,7 @@
 				DhcpLeaseFile:            tt.fields.DhcpLeaseFile,
 				ProgressJSON:             tt.fields.ProgressJSON,
 			}
-			if err := a.doReportProgress(ProgressTypeBootstrapInitiated, false); (err != nil) != tt.wantErr {
+			if err := a.doReportProgress(ProgressTypeBootstrapInitiated); (err != nil) != tt.wantErr {
 				t.Errorf("doReportProgress() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})