lxc: Update fields of api entities

Signed-off-by: Din Music <din.music@canonical.com>
canonical · Mar 6, 2024 · 0631dd4 · 0631dd4
1 parent 5c1b82c
commit 0631dd4
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 26 deletions.
diff --git a/lxc/auth.go b/lxc/auth.go
@@ -560,7 +560,7 @@ func (c *cmdGroupPermissionAdd) run(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("Group %q already has entitlement %q on entity %q", resource.name, permission.Entitlement, permission.EntityReference)
 	}
 
-	return resource.server.UpdateAuthGroup(resource.name, group.AuthGroupPut, eTag)
+	return resource.server.UpdateAuthGroup(resource.name, group.Writable(), eTag)
 }
 
 type cmdGroupPermissionRemove struct {
@@ -628,8 +628,8 @@ func (c *cmdGroupPermissionRemove) run(cmd *cobra.Command, args []string) error
 		return fmt.Errorf("Group %q does not have entitlement %q on entity %q", resource.name, permission.Entitlement, permission.EntityReference)
 	}
 
-	group.AuthGroupPut.Permissions = permissions
-	return resource.server.UpdateAuthGroup(resource.name, group.AuthGroupPut, eTag)
+	group.Permissions = permissions
+	return resource.server.UpdateAuthGroup(resource.name, group.Writable(), eTag)
 }
 
 // parsePermissionArgs parses the `<entity_type> [<entity_name>] <entitlement> [<key>=<value>...]` arguments of
@@ -832,7 +832,7 @@ func (c *cmdIdentityShow) command() *cobra.Command {
 	cmd.Long = cli.FormatSection(i18n.G("Description"), i18n.G(
 		`Show identity configurations
 
-The argument must be a concatenation of the authentication method and either the 
+The argument must be a concatenation of the authentication method and either the
 name or identifier of the identity, delimited by a forward slash. This command
 will fail if an identity name is used that is not unique within the authentication
 method. Use the identifier instead if this occurs.
@@ -1151,7 +1151,7 @@ func (c *cmdIdentityGroupAdd) run(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("Identity %q is already a member of group %q", resource.name, args[1])
 	}
 
-	return resource.server.UpdateIdentity(authenticationMethod, nameOrID, identity.IdentityPut, eTag)
+	return resource.server.UpdateIdentity(authenticationMethod, nameOrID, identity.Writable(), eTag)
 }
 
 type cmdIdentityGroupRemove struct {
@@ -1218,8 +1218,8 @@ func (c *cmdIdentityGroupRemove) run(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("Identity %q is not a member of group %q", resource.name, args[0])
 	}
 
-	identity.IdentityPut.Groups = groups
-	return resource.server.UpdateIdentity(authenticationMethod, nameOrID, identity.IdentityPut, eTag)
+	identity.Groups = groups
+	return resource.server.UpdateIdentity(authenticationMethod, nameOrID, identity.Writable(), eTag)
 }
 
 type cmdPermission struct {
@@ -1912,7 +1912,7 @@ func (c *cmdIdentityProviderGroupGroupAdd) run(cmd *cobra.Command, args []string
 		return fmt.Errorf("Identity group %q is already mapped to group %q", resource.name, args[1])
 	}
 
-	return resource.server.UpdateIdentityProviderGroup(resource.name, idpGroup.IdentityProviderGroupPut, eTag)
+	return resource.server.UpdateIdentityProviderGroup(resource.name, idpGroup.Writable(), eTag)
 }
 
 type cmdIdentityProviderGroupGroupRemove struct {
@@ -1974,6 +1974,6 @@ func (c *cmdIdentityProviderGroupGroupRemove) run(cmd *cobra.Command, args []str
 		return fmt.Errorf("Identity provider group %q is not mapped to group %q", resource.name, args[1])
 	}
 
-	idpGroup.IdentityProviderGroupPut.Groups = groups
-	return resource.server.UpdateIdentityProviderGroup(resource.name, idpGroup.IdentityProviderGroupPut, eTag)
+	idpGroup.Groups = groups
+	return resource.server.UpdateIdentityProviderGroup(resource.name, idpGroup.Writable(), eTag)
 }
diff --git a/lxc/cluster.go b/lxc/cluster.go
@@ -167,7 +167,7 @@ func (c *cmdClusterList) Run(cmd *cobra.Command, args []string) error {
 	// Render the table
 	data := [][]string{}
 	for _, member := range members {
-		roles := member.ClusterMemberPut.Roles
+		roles := member.Roles
 		rolesDelimiter := "\n"
 		if c.flagFormat == "csv" {
 			rolesDelimiter = ","

diff --git a/lxc/list.go b/lxc/list.go
@@ -944,7 +944,7 @@ func (c *cmdList) matchByStatus(cInfo *api.Instance, cState *api.InstanceState,
 }
 
 func (c *cmdList) matchByArchitecture(cInfo *api.Instance, cState *api.InstanceState, query string) bool {
-	return strings.EqualFold(cInfo.InstancePut.Architecture, query)
+	return strings.EqualFold(cInfo.Architecture, query)
 }
 
 func (c *cmdList) matchByLocation(cInfo *api.Instance, cState *api.InstanceState, query string) bool {

diff --git a/lxc/list_test.go b/lxc/list_test.go
@@ -27,16 +27,18 @@ func TestDotPrefixMatch(t *testing.T) {
 func TestShouldShow(t *testing.T) {
 	list := cmdList{}
 	inst := &api.Instance{
-		Name: "foo",
+		Name:         "foo",
+		Type:         "Container",
+		Status:       "Running",
+		Location:     "mem-brain",
+		Architecture: "potato",
+		Description:  "Something which does something",
 		ExpandedConfig: map[string]string{
 			"security.privileged": "1",
 			"user.blah":           "abc",
 			"image.os":            "Debian",
 			"image.description":   "Debian buster amd64 (20200429_05:24)",
 		},
-		Status:   "Running",
-		Location: "mem-brain",
-		Type:     "Container",
 		ExpandedDevices: map[string]map[string]string{
 			"eth0": {
 				"name":    "eth0",
@@ -45,10 +47,6 @@ func TestShouldShow(t *testing.T) {
 				"nictype": "bridged",
 			},
 		},
-		InstancePut: api.InstancePut{
-			Architecture: "potato",
-			Description:  "Something which does something",
-		},
 	}
 
 	state := &api.InstanceState{

diff --git a/lxc/network_acl.go b/lxc/network_acl.go
@@ -587,7 +587,7 @@ func (c *cmdNetworkACLEdit) Run(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
-		return resource.server.UpdateNetworkACL(resource.name, newdata.NetworkACLPut, "")
+		return resource.server.UpdateNetworkACL(resource.name, newdata.Writable(), "")
 	}
 
 	// Get the current config.

diff --git a/lxc/network_forward.go b/lxc/network_forward.go
@@ -601,7 +601,7 @@ func (c *cmdNetworkForwardEdit) Run(cmd *cobra.Command, args []string) error {
 
 		newData.Normalise()
 
-		return client.UpdateNetworkForward(resource.name, args[1], newData.NetworkForwardPut, "")
+		return client.UpdateNetworkForward(resource.name, args[1], newData.Writable(), "")
 	}
 
 	// Get the current config.

diff --git a/lxc/network_load_balancer.go b/lxc/network_load_balancer.go
@@ -603,7 +603,7 @@ func (c *cmdNetworkLoadBalancerEdit) Run(cmd *cobra.Command, args []string) erro
 
 		newData.Normalise()
 
-		return client.UpdateNetworkLoadBalancer(resource.name, args[1], newData.NetworkLoadBalancerPut, "")
+		return client.UpdateNetworkLoadBalancer(resource.name, args[1], newData.Writable(), "")
 	}
 
 	// Get the current config.

diff --git a/lxc/network_peer.go b/lxc/network_peer.go
@@ -577,7 +577,7 @@ func (c *cmdNetworkPeerEdit) Run(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
-		return client.UpdateNetworkPeer(resource.name, args[1], newData.NetworkPeerPut, "")
+		return client.UpdateNetworkPeer(resource.name, args[1], newData.Writable(), "")
 	}
 
 	// Get the current config.

diff --git a/lxc/network_zone.go b/lxc/network_zone.go
@@ -518,7 +518,7 @@ func (c *cmdNetworkZoneEdit) Run(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
-		return resource.server.UpdateNetworkZone(resource.name, newdata.NetworkZonePut, "")
+		return resource.server.UpdateNetworkZone(resource.name, newdata.Writable(), "")
 	}
 
 	// Get the current config.
@@ -1110,7 +1110,7 @@ func (c *cmdNetworkZoneRecordEdit) Run(cmd *cobra.Command, args []string) error
 			return err
 		}
 
-		return resource.server.UpdateNetworkZoneRecord(resource.name, args[1], newdata.NetworkZoneRecordPut, "")
+		return resource.server.UpdateNetworkZoneRecord(resource.name, args[1], newdata.Writable(), "")
 	}
 
 	// Get the current config.