Skip to content

Commit

Permalink
Change cluster profile update call
Browse files Browse the repository at this point in the history
  • Loading branch information
@saamalik
saamalik committed May 3, 2021
1 parent 30af03b commit 898edf2
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 56 deletions.
41 changes: 5 additions & 36 deletions pkg/client/cluster_profile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,56 +104,25 @@ func (h *V1alpha1Client) GetPacks(filters []string) ([]*models.V1alpha1PackSumma
return packs, nil
}

func (h *V1alpha1Client) UpdateClusterProfile(clusterProfile *models.V1alpha1ClusterProfileEntity) error {
func (h *V1alpha1Client) UpdateClusterProfile(clusterProfile *models.V1alpha1ClusterProfileUpdateEntity) error {
client, err := h.getClusterClient()
if err != nil {
return nil
}

packUpdateParams := make([]*models.V1alpha1PackManifestUpdateEntity, 0, 1)
for _, p := range clusterProfile.Spec.Template.Packs {
manifests := make([]*models.V1alpha1ManifestRefUpdateEntity, len(p.Manifests))
for i, m := range p.Manifests {
manifests[i] = &models.V1alpha1ManifestRefUpdateEntity{
Content: m.Content,
Name: ptr.StringPtr(m.Name),
// Seems backend already handles a not passed in UID
UID: "",
}
}
packUpdateParams = append(packUpdateParams, &models.V1alpha1PackManifestUpdateEntity{
Layer: p.Layer,
Name: p.Name,
Tag: p.Tag,
Type: p.Type,
UID: *p.UID,
Values: p.Values,
Manifests: manifests,
})
}

uid := clusterProfile.Metadata.UID
updateParam := &models.V1alpha1ClusterProfileUpdateEntity{
Metadata: clusterProfile.Metadata,
Spec: &models.V1alpha1ClusterProfileUpdateEntitySpec{
Template: &models.V1alpha1ClusterProfileTemplateUpdate{
Packs: packUpdateParams,
Type: clusterProfile.Spec.Template.Type,
},
},
}
params := clusterC.NewV1alpha1ClusterProfilesUpdateParamsWithContext(h.ctx).WithUID(uid).WithBody(updateParam)

params := clusterC.NewV1alpha1ClusterProfilesUpdateParamsWithContext(h.ctx).WithUID(uid).WithBody(clusterProfile)
_, err = client.V1alpha1ClusterProfilesUpdate(params)
return err
}

func (h *V1alpha1Client) CreateClusterProfile(cluster *models.V1alpha1ClusterProfileEntity) (string, error) {
func (h *V1alpha1Client) CreateClusterProfile(clusterProfile *models.V1alpha1ClusterProfileEntity) (string, error) {
client, err := h.getClusterClient()
if err != nil {
return "", err
}

params := clusterC.NewV1alpha1ClusterProfilesCreateParamsWithContext(h.ctx).WithBody(cluster)
params := clusterC.NewV1alpha1ClusterProfilesCreateParamsWithContext(h.ctx).WithBody(clusterProfile)
success, err := client.V1alpha1ClusterProfilesCreate(params)
if err != nil {
return "", err
Expand Down
105 changes: 85 additions & 20 deletions spectrocloud/resource_cluster_profile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func resourceClusterProfile() *schema.Resource {
"type": {
Type: schema.TypeString,
Optional: true,
Default: "spectro",
Default: "spectro",
},
"uid": {
Type: schema.TypeString,
Expand All @@ -68,20 +68,20 @@ func resourceClusterProfile() *schema.Resource {
Required: true,
},
"manifest": {
Type: schema.TypeList,
Type: schema.TypeList,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"uid" : {
Type: schema.TypeString,
"uid": {
Type: schema.TypeString,
Computed: true,
},
"name" : {
Type: schema.TypeString,
"name": {
Type: schema.TypeString,
Required: true,
},
"content" : {
Type: schema.TypeString,
"content": {
Type: schema.TypeString,
Required: true,
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
// UI strips the trailing newline on save
Expand Down Expand Up @@ -126,7 +126,7 @@ func resourceClusterProfileCreate(ctx context.Context, d *schema.ResourceData, m
// Warning or errors can be collected in a slice type
var diags diag.Diagnostics

clusterProfile, err := toClusterProfile(d)
clusterProfile, err := toClusterProfileCreate(d)
if err != nil {
return diag.FromErr(err)
}
Expand Down Expand Up @@ -225,7 +225,7 @@ func resourceClusterProfileUpdate(ctx context.Context, d *schema.ResourceData, m

if d.HasChanges("pack") {
log.Printf("Updating packs")
cluster, err := toClusterProfile(d)
cluster, err := toClusterProfileUpdate(d)
if err != nil {
return diag.FromErr(err)
}
Expand Down Expand Up @@ -255,12 +255,8 @@ func resourceClusterProfileDelete(_ context.Context, d *schema.ResourceData, m i
return diags
}

func toClusterProfile(d *schema.ResourceData) (*models.V1alpha1ClusterProfileEntity, error) {
// gnarly, I know! =/
//cloudConfig := d.Get("cloud_config").([]interface{})[0].(map[string]interface{})
//clientSecret := strfmt.Password(d.Get("azure_client_secret").(string))

cluster := &models.V1alpha1ClusterProfileEntity{
func toClusterProfileCreate(d *schema.ResourceData) (*models.V1alpha1ClusterProfileEntity, error) {
cp := &models.V1alpha1ClusterProfileEntity{
Metadata: &models.V1ObjectMeta{
Name: d.Get("name").(string),
UID: d.Id(),
Expand All @@ -275,18 +271,18 @@ func toClusterProfile(d *schema.ResourceData) (*models.V1alpha1ClusterProfileEnt

packs := make([]*models.V1alpha1PackManifestEntity, 0)
for _, pack := range d.Get("pack").([]interface{}) {
if p, e := toClusterProfilePack(pack); e != nil {
if p, e := toClusterProfilePackCreate(pack); e != nil {
return nil, e
} else {
packs = append(packs, p)
}
}
cluster.Spec.Template.Packs = packs
cp.Spec.Template.Packs = packs

return cluster, nil
return cp, nil
}

func toClusterProfilePack(pSrc interface{}) (*models.V1alpha1PackManifestEntity, error) {
func toClusterProfilePackCreate(pSrc interface{}) (*models.V1alpha1PackManifestEntity, error) {
p := pSrc.(map[string]interface{})

pName := p["name"].(string)
Expand Down Expand Up @@ -327,3 +323,72 @@ func toClusterProfilePack(pSrc interface{}) (*models.V1alpha1PackManifestEntity,

return pack, nil
}

func toClusterProfileUpdate(d *schema.ResourceData) (*models.V1alpha1ClusterProfileUpdateEntity, error) {
cp := &models.V1alpha1ClusterProfileUpdateEntity{
Metadata: &models.V1ObjectMeta{
Name: d.Get("name").(string),
UID: d.Id(),
},
Spec: &models.V1alpha1ClusterProfileUpdateEntitySpec{
Template: &models.V1alpha1ClusterProfileTemplateUpdate{
Type: models.V1alpha1ProfileType(d.Get("type").(string)),
},
},
}

packs := make([]*models.V1alpha1PackManifestUpdateEntity, 0)
for _, pack := range d.Get("pack").([]interface{}) {
if p, e := toClusterProfilePackUpdate(pack); e != nil {
return nil, e
} else {
packs = append(packs, p)
}
}
cp.Spec.Template.Packs = packs

return cp, nil
}

func toClusterProfilePackUpdate(pSrc interface{}) (*models.V1alpha1PackManifestUpdateEntity, error) {
p := pSrc.(map[string]interface{})

pName := p["name"].(string)
pTag := p["tag"].(string)
pUID := p["uid"].(string)
pType := models.V1alpha1PackType(p["type"].(string))

switch pType {
case models.V1alpha1PackTypeSpectro:
if pTag == "" || pUID == "" {
return nil, fmt.Errorf("pack %s needs to specify tag", pName)
}
case models.V1alpha1PackTypeManifest:
if pUID == "" {
pUID = "spectro-manifest-pack"
}
}

pack := &models.V1alpha1PackManifestUpdateEntity{
//Layer: p["layer"].(string),
Name: ptr.StringPtr(pName),
Tag: p["tag"].(string),
UID: pUID,
Type: pType,
// UI strips a single newline, so we should do the same
Values: strings.TrimSpace(p["values"].(string)),
}

manifests := make([]*models.V1alpha1ManifestRefUpdateEntity, 0)
for _, manifest := range p["manifest"].([]interface{}) {
m := manifest.(map[string]interface{})
manifests = append(manifests, &models.V1alpha1ManifestRefUpdateEntity{
Content: strings.TrimSpace(m["content"].(string)),
Name: ptr.StringPtr(m["name"].(string)),
UID: m["uid"].(string),
})
}
pack.Manifests = manifests

return pack, nil
}

0 comments on commit 898edf2

Please sign in to comment.