fixup! fixup! fixup! fixup! fixup! fixup! Revert "[CLOUDTRUST-1502] S…

…elf service API"
cloudtrust · Sep 11, 2019 · 83bb552 · 83bb552
1 parent 1159331
commit 83bb552
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/pkg/export/component.go b/pkg/export/component.go
@@ -83,13 +83,13 @@ func (c *component) StoreAndExport(ctx context.Context) (map[string]interface{},
 	// Store
 	var data, err = json.Marshal(realmsMap)
 	if err != nil {
-		return nil, errors.Wrapf(err, internal.MsgErrCannotMarshal+"."+internal.Config+".%s.%s", c.componentName, c.componentVersion)
+		return nil, errors.Wrapf(err, internal.MsgErrCannotMarshal+"."+internal.Config+"."+c.componentName+"."+c.componentVersion)
 	}
 
 	err = c.s.Save(c.componentName, c.componentVersion, data)
 
 	if err != nil {
-		return nil, errors.Wrapf(err, internal.MsgErrCannotSaveConfigInDB+".%s.%s", c.componentName, c.componentVersion)
+		return nil, errors.Wrapf(err, internal.MsgErrCannotSaveConfigInDB+"."+c.componentName+"."+c.componentVersion)
 	}
 
 	return realmsMap, nil

diff --git a/pkg/export/storage.go b/pkg/export/storage.go
@@ -39,7 +39,7 @@ func (c *StorageModule) Save(componentName, version string, config []byte) error
 	var _, err = c.db.Exec(upsertConfigStmt, componentName, version, config)
 
 	if err != nil {
-		return errors.Wrapf(err, internal.MsgErrCannotUpdate+"."+internal.Config+".%s.%s", componentName, version)
+		return errors.Wrapf(err, internal.MsgErrCannotUpdate+"."+internal.Config+"."+componentName+"."+version)
 	}
 
 	return nil
@@ -54,7 +54,7 @@ func (c *StorageModule) Read(componentName, version string) ([]byte, error) {
 
 	var err = row.Scan(&cName, &v, &config)
 	if err != nil {
-		return nil, errors.Wrapf(err, internal.MsgErrCannotUpdate+"."+internal.Config+".%s.%s", componentName, version)
+		return nil, errors.Wrapf(err, internal.MsgErrCannotUpdate+"."+internal.Config+"."+componentName+"."+version)
 	}
 
 	return config, nil

diff --git a/pkg/management/endpoint.go b/pkg/management/endpoint.go
@@ -140,10 +140,11 @@ func MakeCreateUserEndpoint(managementComponent ManagementComponent) cs.Endpoint
 		}
 
 		url, err := convertLocationURL(keycloakLocation, m["scheme"], m["host"])
+		// TODO: log the error and the unhappy url
 
 		return LocationHeader{
 			URL: url,
-		}, err
+		}, nil
 	}
 }
 
@@ -440,10 +441,11 @@ func MakeCreateClientRoleEndpoint(managementComponent ManagementComponent) cs.En
 		}
 
 		url, err := convertLocationURL(keycloakLocation, m["scheme"], m["host"])
+		// TODO: log the error and the unhappy url
 
 		return LocationHeader{
 			URL: url,
-		}, err
+		}, nil
 	}
 }