update tags.go to include volume snapshots and databases
This commit is contained in:
Austin
parent
b4be4ac9b6
commit
860ee9fb0f
20
tags.go
20
tags.go
|
|
@ -43,6 +43,8 @@ const (
|
|||
LoadBalancerResourceType ResourceType = "load_balancer"
|
||||
// VolumeSnapshotResourceType holds the string representing our ResourceType for storage Snapshots.
|
||||
VolumeSnapshotResourceType ResourceType = "volume_snapshot"
|
||||
// DatabaseResourceType holds the string representing our ResourceType of Database.
|
||||
DatabaseResourceType ResourceType = "database"
|
||||
)
|
||||
|
||||
// Resource represent a single resource for associating/disassociating with tags
|
||||
|
|
@ -53,11 +55,13 @@ type Resource struct {
|
|||
|
||||
// TaggedResources represent the set of resources a tag is attached to
|
||||
type TaggedResources struct {
|
||||
Count int `json:"count"`
|
||||
LastTaggedURI string `json:"last_tagged_uri,omitempty"`
|
||||
Droplets *TaggedDropletsResources `json:"droplets,omitempty"`
|
||||
Images *TaggedImagesResources `json:"images"`
|
||||
Volumes *TaggedVolumesResources `json:"volumes"`
|
||||
Count int `json:"count"`
|
||||
LastTaggedURI string `json:"last_tagged_uri,omitempty"`
|
||||
Droplets *TaggedDropletsResources `json:"droplets,omitempty"`
|
||||
Images *TaggedImagesResources `json:"images"`
|
||||
Volumes *TaggedVolumesResources `json:"volumes"`
|
||||
VolumeSnapshots *TaggedVolumeSnapshotsResources `json:"volume_snapshots"`
|
||||
Databases *TaggedDatabasesResources `json:"databases"`
|
||||
}
|
||||
|
||||
// TaggedDropletsResources represent the droplet resources a tag is attached to
|
||||
|
|
@ -79,6 +83,12 @@ type TaggedImagesResources TaggedResourcesData
|
|||
// TaggedVolumesResources represent the volume resources a tag is attached to
|
||||
type TaggedVolumesResources TaggedResourcesData
|
||||
|
||||
// TaggedVolumeSnapshotsResources represent the volume snapshot resources a tag is attached to
|
||||
type TaggedVolumeSnapshotsResources TaggedResourcesData
|
||||
|
||||
// TaggedDatabasesResources represent the database resources a tag is attached to
|
||||
type TaggedDatabasesResources TaggedResourcesData
|
||||
|
||||
// Tag represent DigitalOcean tag
|
||||
type Tag struct {
|
||||
Name string `json:"name,omitempty"`
|
||||
|
|
|
|||
70
tags_test.go
70
tags_test.go
|
|
@ -35,6 +35,12 @@ var (
|
|||
},
|
||||
"volumes": {
|
||||
"count": 0
|
||||
},
|
||||
"volume_snapshots": {
|
||||
"count": 0
|
||||
},
|
||||
"databases": {
|
||||
"count": 0
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -51,6 +57,12 @@ var (
|
|||
},
|
||||
"volumes": {
|
||||
"count": 0
|
||||
},
|
||||
"volume_snapshots": {
|
||||
"count": 0
|
||||
},
|
||||
"databases": {
|
||||
"count": 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -84,6 +96,12 @@ var (
|
|||
},
|
||||
"volumes": {
|
||||
"count": 0
|
||||
},
|
||||
"volume_snapshots": {
|
||||
"count": 0
|
||||
},
|
||||
"databases": {
|
||||
"count": 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -95,7 +113,7 @@ var (
|
|||
"tag": {
|
||||
"name": "testing-1",
|
||||
"resources": {
|
||||
"count": 2,
|
||||
"count": 5,
|
||||
"last_tagged_uri": "https://api.digitalocean.com/v2/droplets/1",
|
||||
"droplets": {
|
||||
"count": 1,
|
||||
|
|
@ -189,6 +207,14 @@ var (
|
|||
"volumes": {
|
||||
"count": 1,
|
||||
"last_tagged_uri": "https://api.digitalocean.com/v2/volumes/abc"
|
||||
},
|
||||
"volume_snapshots": {
|
||||
"count": 1,
|
||||
"last_tagged_uri": "https://api.digitalocean.com/v2/snapshots/1"
|
||||
},
|
||||
"databases": {
|
||||
"count": 1,
|
||||
"last_tagged_uri": "https://api.digitalocean.com/v2/databases/1"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -211,8 +237,8 @@ func TestTags_List(t *testing.T) {
|
|||
}
|
||||
|
||||
expected := []Tag{
|
||||
{Name: "testing-1", Resources: &TaggedResources{Count: 0, Droplets: &TaggedDropletsResources{Count: 0, LastTagged: nil}, Images: &TaggedImagesResources{Count: 0}, Volumes: &TaggedVolumesResources{Count: 0}}},
|
||||
{Name: "testing-2", Resources: &TaggedResources{Count: 0, Droplets: &TaggedDropletsResources{Count: 0, LastTagged: nil}, Images: &TaggedImagesResources{Count: 0}, Volumes: &TaggedVolumesResources{Count: 0}}},
|
||||
{Name: "testing-1", Resources: &TaggedResources{Count: 0, Droplets: &TaggedDropletsResources{Count: 0, LastTagged: nil}, Images: &TaggedImagesResources{Count: 0}, Volumes: &TaggedVolumesResources{Count: 0}, VolumeSnapshots: &TaggedVolumeSnapshotsResources{Count: 0}, Databases: &TaggedDatabasesResources{Count: 0}}},
|
||||
{Name: "testing-2", Resources: &TaggedResources{Count: 0, Droplets: &TaggedDropletsResources{Count: 0, LastTagged: nil}, Images: &TaggedImagesResources{Count: 0}, Volumes: &TaggedVolumesResources{Count: 0}, VolumeSnapshots: &TaggedVolumeSnapshotsResources{Count: 0}, Databases: &TaggedDatabasesResources{Count: 0}}},
|
||||
}
|
||||
if !reflect.DeepEqual(tags, expected) {
|
||||
t.Errorf("Tags.List returned %+v, expected %+v", tags, expected)
|
||||
|
|
@ -273,8 +299,8 @@ func TestTags_Get(t *testing.T) {
|
|||
t.Errorf("Tags.Get return an incorrect name, got %+v, expected %+v", tag.Name, "testing-1")
|
||||
}
|
||||
|
||||
if tag.Resources.Count != 2 {
|
||||
t.Errorf("Tags.Get return an incorrect resource count, got %+v, expected %+v", tag.Resources.Count, 2)
|
||||
if tag.Resources.Count != 5 {
|
||||
t.Errorf("Tags.Get return an incorrect resource count, got %+v, expected %+v", tag.Resources.Count, 5)
|
||||
}
|
||||
|
||||
if tag.Resources.LastTaggedURI != "https://api.digitalocean.com/v2/droplets/1" {
|
||||
|
|
@ -300,6 +326,30 @@ func TestTags_Get(t *testing.T) {
|
|||
if tag.Resources.Images.LastTaggedURI != "https://api.digitalocean.com/v2/images/1" {
|
||||
t.Errorf("Tags.Get return an incorrect last tagged droplet uri %+v, expected %+v", tag.Resources.Images.LastTaggedURI, "https://api.digitalocean.com/v2/images/1")
|
||||
}
|
||||
|
||||
if tag.Resources.Volumes.Count != 1 {
|
||||
t.Errorf("Tags.Get return an incorrect volume resource count, got %+v, expected %+v", tag.Resources.Volumes.Count, 1)
|
||||
}
|
||||
|
||||
if tag.Resources.Volumes.LastTaggedURI != "https://api.digitalocean.com/v2/volumes/abc" {
|
||||
t.Errorf("Tags.Get return an incorrect last tagged volume uri %+v, expected %+v", tag.Resources.Volumes.LastTaggedURI, "https://api.digitalocean.com/v2/volumes/abc")
|
||||
}
|
||||
|
||||
if tag.Resources.VolumeSnapshots.Count != 1 {
|
||||
t.Errorf("Tags.Get return an incorrect volume snapshot resource count, got %+v, expected %+v", tag.Resources.VolumeSnapshots.Count, 1)
|
||||
}
|
||||
|
||||
if tag.Resources.VolumeSnapshots.LastTaggedURI != "https://api.digitalocean.com/v2/snapshots/1" {
|
||||
t.Errorf("Tags.Get return an incorrect last tagged volume snapshot uri %+v, expected %+v", tag.Resources.VolumeSnapshots.LastTaggedURI, "https://api.digitalocean.com/v2/snapshots/1")
|
||||
}
|
||||
|
||||
if tag.Resources.Databases.Count != 1 {
|
||||
t.Errorf("Tags.Get return an incorrect database resource count, got %+v, expected %+v", tag.Resources.Databases.Count, 1)
|
||||
}
|
||||
|
||||
if tag.Resources.Databases.LastTaggedURI != "https://api.digitalocean.com/v2/databases/1" {
|
||||
t.Errorf("Tags.Get return an incorrect last tagged database uri %+v, expected %+v", tag.Resources.Databases.LastTaggedURI, "https://api.digitalocean.com/v2/databases/1")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTags_Create(t *testing.T) {
|
||||
|
|
@ -333,10 +383,12 @@ func TestTags_Create(t *testing.T) {
|
|||
expected := &Tag{
|
||||
Name: "testing-1",
|
||||
Resources: &TaggedResources{
|
||||
Count: 0,
|
||||
Droplets: &TaggedDropletsResources{Count: 0, LastTagged: nil},
|
||||
Images: &TaggedImagesResources{Count: 0},
|
||||
Volumes: &TaggedVolumesResources{Count: 0},
|
||||
Count: 0,
|
||||
Droplets: &TaggedDropletsResources{Count: 0, LastTagged: nil},
|
||||
Images: &TaggedImagesResources{Count: 0},
|
||||
Volumes: &TaggedVolumesResources{Count: 0},
|
||||
VolumeSnapshots: &TaggedVolumeSnapshotsResources{Count: 0},
|
||||
Databases: &TaggedDatabasesResources{Count: 0},
|
||||
},
|
||||
}
|
||||
if !reflect.DeepEqual(tag, expected) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue