diff --git a/CHANGES.md b/CHANGES.md index 6a8ee89..8992649 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## 0.1.2 Nov 28 2022 + +- Added missing fields to Label type + + ## 0.1.0 Aug 23 2022 - First release for OCM Support CLI diff --git a/go.mod b/go.mod index 8c99b3f..b738863 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/nwidger/jsoncolor v0.3.1 github.com/openshift-online/ocm-cli v0.1.64 - github.com/openshift-online/ocm-sdk-go v0.1.286 + github.com/openshift-online/ocm-sdk-go v0.1.296 github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.4.0 ) diff --git a/go.sum b/go.sum index 4ee9852..36dff82 100644 --- a/go.sum +++ b/go.sum @@ -586,8 +586,8 @@ github.com/openshift-online/ocm-cli v0.1.64 h1:U/ILl054dNln9Kb/dhZOCgnhYFwfUMHhj github.com/openshift-online/ocm-cli v0.1.64/go.mod h1:Ccu+zHRdPOHNjHVe+MuD54DTk+ZmqcY1F+waulB8ELA= github.com/openshift-online/ocm-sdk-go v0.1.219/go.mod h1:uDiBAEupl2F5rkTBFC4y4ZPEV/ku/fFEBHot6OkYL+I= github.com/openshift-online/ocm-sdk-go v0.1.273/go.mod h1:KYOw8kAKAHyPrJcQoVR82CneQ4ofC02Na4cXXaTq4Nw= -github.com/openshift-online/ocm-sdk-go v0.1.286 h1:PoSFXqRJ4nlpbVbZK77+WiLx9i31oLPQ/3LAtVEu0xw= -github.com/openshift-online/ocm-sdk-go v0.1.286/go.mod h1:KYOw8kAKAHyPrJcQoVR82CneQ4ofC02Na4cXXaTq4Nw= +github.com/openshift-online/ocm-sdk-go v0.1.296 h1:4u5FFRV/X2E6ZwyH/pW6QxclP8GkRh6ODK/Dk8x1QgM= +github.com/openshift-online/ocm-sdk-go v0.1.296/go.mod h1:KYOw8kAKAHyPrJcQoVR82CneQ4ofC02Na4cXXaTq4Nw= github.com/openshift/rosa v1.1.7/go.mod h1:Ap4vfflxHXfzY0MIt1l9dckwG+DkPUDc/vv1mk1cSCQ= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= diff --git a/pkg/info/info.go b/pkg/info/info.go index d5e52c1..4f883f6 100644 --- a/pkg/info/info.go +++ b/pkg/info/info.go @@ -3,6 +3,6 @@ package info // Version of the ocm-support-cli -const Version = "0.1.1" +const Version = "0.1.2" var VersionStamp string diff --git a/pkg/label/label.go b/pkg/label/label.go index b49bea6..240cc94 100644 --- a/pkg/label/label.go +++ b/pkg/label/label.go @@ -12,13 +12,18 @@ import ( type Label struct { types.Meta - ID string `json:"id"` - CreatedAt time.Time `json:"created_at"` - Key string `json:"key"` - UpdatedAt time.Time `json:"updated_at"` - Value string `json:"value"` - Internal bool `json:"internal"` - HREF string `json:"href"` + ID string `json:"id"` + CreatedAt time.Time `json:"created_at"` + Key string `json:"key"` + UpdatedAt time.Time `json:"updated_at"` + Value string `json:"value"` + Internal bool `json:"internal"` + HREF string `json:"href"` + Type string `json:"type"` + AccountID string `json:"account_id,omitempty"` + SubscriptionID string `json:"subscription_id,omitempty"` + OrganizationID string `json:"organization_id,omitempty"` + ManagedBy string `json:"managed_by,omitempty"` } type LabelsList []Label @@ -27,13 +32,18 @@ func PresentLabels(labels []*v1.Label) LabelsList { var labelsList []Label for _, label := range labels { lbl := Label{ - ID: label.ID(), - CreatedAt: label.CreatedAt(), - Key: label.Key(), - UpdatedAt: label.UpdatedAt(), - Value: label.Value(), - Internal: label.Internal(), - HREF: label.HREF(), + ID: label.ID(), + CreatedAt: label.CreatedAt(), + Key: label.Key(), + UpdatedAt: label.UpdatedAt(), + Value: label.Value(), + Internal: label.Internal(), + HREF: label.HREF(), + Type: label.Type(), + AccountID: label.AccountID(), + SubscriptionID: label.SubscriptionID(), + OrganizationID: label.OrganizationID(), + ManagedBy: label.ManagedBy(), } labelsList = append(labelsList, lbl) }