Mirrored_Repos/psu
1
0
Fork 0
mirror of https://gitlab.com/psuapp/psu.git synced 2024-08-30 18:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove swarm IDs from output

Browse Source
This commit is contained in:
Juan Carlos Mejías Rodríguez 2019-08-09 12:55:03 -04:00
parent 51ce690e1f
commit bf7fd60550
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/stackDeploy.go
View File

@ -58,7 +58,6 @@ var stackDeployCmd = &cobra.Command{
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"stack": stackName, "stack": stackName,
"endpoint": endpointId, "endpoint": endpointId,
"swarm": endpointSwarmClusterId,
}).Debug("Getting stack") }).Debug("Getting stack")
retrievedStack, stackRetrievalErr := common.GetStackByName(stackName, endpointSwarmClusterId, uint32(endpointId)) retrievedStack, stackRetrievalErr := common.GetStackByName(stackName, endpointSwarmClusterId, uint32(endpointId))
switch stackRetrievalErr.(type) { switch stackRetrievalErr.(type) {
@ -127,14 +126,12 @@ var stackDeployCmd = &cobra.Command{
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"stack": stackName, "stack": stackName,
"endpoint": endpointId, "endpoint": endpointId,
"swarm": endpointSwarmClusterId,
}).Info("Creating stack") }).Info("Creating stack")
stack, deploymentErr := portainerClient.CreateSwarmStack(stackName, loadedEnvironmentVariables, stackFileContent, endpointSwarmClusterId, uint32(endpointId)) stack, deploymentErr := portainerClient.CreateSwarmStack(stackName, loadedEnvironmentVariables, stackFileContent, endpointSwarmClusterId, uint32(endpointId))
common.CheckError(deploymentErr) common.CheckError(deploymentErr)
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"stack": stack.Name, "stack": stack.Name,
"endpoint": stack.EndpointID, "endpoint": stack.EndpointID,
"swarm": stack.SwarmID,
"id": stack.Id, "id": stack.Id,
}).Info("Stack created") }).Info("Stack created")
} else { } else {

5
cmd/stackList.go
View File

@ -35,7 +35,6 @@ var stackListCmd = &cobra.Command{
// It's a swarm cluster // It's a swarm cluster
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"endpoint": endpointId, "endpoint": endpointId,
"swarm": endpointSwarmClusterId,
}).Debug("Getting stacks") }).Debug("Getting stacks")
stacks, err = portainerClient.GetStacks(endpointSwarmClusterId, uint32(endpointId)) stacks, err = portainerClient.GetStacks(endpointSwarmClusterId, uint32(endpointId))
common.CheckError(err) common.CheckError(err)
@ -78,17 +77,15 @@ var stackListCmd = &cobra.Command{
"NAME", "NAME",
"TYPE", "TYPE",
"ENDPOINT ID", "ENDPOINT ID",
"SWARM ID",
}) })
common.CheckError(err) common.CheckError(err)
for _, s := range stacks { for _, s := range stacks {
_, err := fmt.Fprintln(writer, fmt.Sprintf( _, err := fmt.Fprintln(writer, fmt.Sprintf(
"%v\t%s\t%v\t%v\t%s", "%v\t%s\t%v\t%v",
s.Id, s.Id,
s.Name, s.Name,
s.GetTranslatedStackType(), s.GetTranslatedStackType(),
s.EndpointID, s.EndpointID,
s.SwarmID,
)) ))
common.CheckError(err) common.CheckError(err)
} }

1
cmd/stackRemove.go
View File

@ -43,7 +43,6 @@ var stackRemoveCmd = &cobra.Command{
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"stack": stackName, "stack": stackName,
"endpoint": endpointId, "endpoint": endpointId,
"swarm": endpointSwarmClusterId,
}).Debug("Getting stack") }).Debug("Getting stack")
stack, stackRetrievalErr = common.GetStackByName(stackName, endpointSwarmClusterId, uint32(endpointId)) stack, stackRetrievalErr = common.GetStackByName(stackName, endpointSwarmClusterId, uint32(endpointId))
case *common.StackClusterNotFoundError: case *common.StackClusterNotFoundError: