MG-888 - Add bootstrap SDK tests (absmach#2261)

Signed-off-by: 1998-felix <[email protected]>
dborovcanin · Jun 26, 2024 · 1893107 · 1893107
1 parent 50b374b
commit 1893107
Show file tree

Hide file tree

Showing 8 changed files with 1,333 additions and 30 deletions.
diff --git a/bootstrap/mocks/config_reader.go b/bootstrap/mocks/config_reader.go
diff --git a/bootstrap/service.go b/bootstrap/service.go
@@ -108,6 +108,8 @@ type Service interface {
 // as a JSON and consumed from the client side. The purpose of this interface
 // is to provide convenient way to generate custom configuration response
 // based on the specific Config which will be consumed by the client.
+//
+//go:generate mockery --name ConfigReader --output=./mocks --filename config_reader.go --quiet --note "Copyright (c) Abstract Machines"
 type ConfigReader interface {
 	ReadConfig(Config, bool) (interface{}, error)
 }

diff --git a/cli/bootstrap.go b/cli/bootstrap.go
@@ -190,7 +190,7 @@ var cmdBootstrap = []cobra.Command{
 				return
 			}
 
-			if err := sdk.Whitelist(cfg, args[1]); err != nil {
+			if err := sdk.Whitelist(cfg.ThingID, cfg.State, args[1]); err != nil {
 				logError(err)
 				return
 			}

diff --git a/pkg/sdk/go/bootstrap.go b/pkg/sdk/go/bootstrap.go
@@ -132,24 +132,27 @@ func (sdk mgSDK) Bootstraps(pm PageMetadata, token string) (BootstrapPage, error
 	return bb, nil
 }
 
-func (sdk mgSDK) Whitelist(cfg BootstrapConfig, token string) errors.SDKError {
-	data, err := json.Marshal(BootstrapConfig{State: cfg.State})
-	if err != nil {
-		return errors.NewSDKError(err)
+func (sdk mgSDK) Whitelist(thingID string, state int, token string) errors.SDKError {
+	if thingID == "" {
+		return errors.NewSDKError(apiutil.ErrMissingID)
 	}
 
-	if cfg.ThingID == "" {
-		return errors.NewSDKError(apiutil.ErrNotFoundParam)
+	data, err := json.Marshal(BootstrapConfig{State: state})
+	if err != nil {
+		return errors.NewSDKError(err)
 	}
 
-	url := fmt.Sprintf("%s/%s/%s", sdk.bootstrapURL, whitelistEndpoint, cfg.ThingID)
+	url := fmt.Sprintf("%s/%s/%s", sdk.bootstrapURL, whitelistEndpoint, thingID)
 
 	_, _, sdkerr := sdk.processRequest(http.MethodPut, url, token, data, nil, http.StatusCreated, http.StatusOK)
 
 	return sdkerr
 }
 
 func (sdk mgSDK) ViewBootstrap(id, token string) (BootstrapConfig, errors.SDKError) {
+	if id == "" {
+		return BootstrapConfig{}, errors.NewSDKError(apiutil.ErrMissingID)
+	}
 	url := fmt.Sprintf("%s/%s/%s", sdk.bootstrapURL, configsEndpoint, id)
 
 	_, body, err := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
@@ -166,19 +169,25 @@ func (sdk mgSDK) ViewBootstrap(id, token string) (BootstrapConfig, errors.SDKErr
 }
 
 func (sdk mgSDK) UpdateBootstrap(cfg BootstrapConfig, token string) errors.SDKError {
+	if cfg.ThingID == "" {
+		return errors.NewSDKError(apiutil.ErrMissingID)
+	}
+	url := fmt.Sprintf("%s/%s/%s", sdk.bootstrapURL, configsEndpoint, cfg.ThingID)
+
 	data, err := json.Marshal(cfg)
 	if err != nil {
 		return errors.NewSDKError(err)
 	}
 
-	url := fmt.Sprintf("%s/%s/%s", sdk.bootstrapURL, configsEndpoint, cfg.ThingID)
-
 	_, _, sdkerr := sdk.processRequest(http.MethodPut, url, token, data, nil, http.StatusOK)
 
 	return sdkerr
 }
 
 func (sdk mgSDK) UpdateBootstrapCerts(id, clientCert, clientKey, ca, token string) (BootstrapConfig, errors.SDKError) {
+	if id == "" {
+		return BootstrapConfig{}, errors.NewSDKError(apiutil.ErrMissingID)
+	}
 	url := fmt.Sprintf("%s/%s/%s", sdk.bootstrapURL, bootstrapCertsEndpoint, id)
 	request := BootstrapConfig{
 		ClientCert: clientCert,
@@ -192,16 +201,22 @@ func (sdk mgSDK) UpdateBootstrapCerts(id, clientCert, clientKey, ca, token strin
 	}
 
 	_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
+	if sdkerr != nil {
+		return BootstrapConfig{}, sdkerr
+	}
 
 	var bc BootstrapConfig
 	if err := json.Unmarshal(body, &bc); err != nil {
 		return BootstrapConfig{}, errors.NewSDKError(err)
 	}
 
-	return bc, sdkerr
+	return bc, nil
 }
 
 func (sdk mgSDK) UpdateBootstrapConnection(id string, channels []string, token string) errors.SDKError {
+	if id == "" {
+		return errors.NewSDKError(apiutil.ErrMissingID)
+	}
 	url := fmt.Sprintf("%s/%s/%s", sdk.bootstrapURL, bootstrapConnEndpoint, id)
 	request := map[string][]string{
 		"channels": channels,
@@ -216,13 +231,19 @@ func (sdk mgSDK) UpdateBootstrapConnection(id string, channels []string, token s
 }
 
 func (sdk mgSDK) RemoveBootstrap(id, token string) errors.SDKError {
+	if id == "" {
+		return errors.NewSDKError(apiutil.ErrMissingID)
+	}
 	url := fmt.Sprintf("%s/%s/%s", sdk.bootstrapURL, configsEndpoint, id)
 
 	_, _, err := sdk.processRequest(http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
 	return err
 }
 
 func (sdk mgSDK) Bootstrap(externalID, externalKey string) (BootstrapConfig, errors.SDKError) {
+	if externalID == "" {
+		return BootstrapConfig{}, errors.NewSDKError(apiutil.ErrMissingID)
+	}
 	url := fmt.Sprintf("%s/%s/%s", sdk.bootstrapURL, bootstrapEndpoint, externalID)
 
 	_, body, err := sdk.processRequest(http.MethodGet, url, ThingPrefix+externalKey, nil, nil, http.StatusOK)
@@ -239,6 +260,9 @@ func (sdk mgSDK) Bootstrap(externalID, externalKey string) (BootstrapConfig, err
 }
 
 func (sdk mgSDK) BootstrapSecure(externalID, externalKey, cryptoKey string) (BootstrapConfig, errors.SDKError) {
+	if externalID == "" {
+		return BootstrapConfig{}, errors.NewSDKError(apiutil.ErrMissingID)
+	}
 	url := fmt.Sprintf("%s/%s/%s/%s", sdk.bootstrapURL, bootstrapEndpoint, secureEndpoint, externalID)
 
 	encExtKey, err := bootstrapEncrypt([]byte(externalKey), cryptoKey)