Skip to content

Commit

Permalink
Remove unused ArtifactCloudObject (#4218)
Browse files Browse the repository at this point in the history
* Remove unused ArtifactCloudObject

* Remove CloudObjectProvider
  • Loading branch information
pavannd1 authored and Ilya Kislenko committed Oct 23, 2018
1 parent 0cbf809 commit 2f5e56d
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 63 deletions.
23 changes: 1 addition & 22 deletions pkg/apis/cr/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,28 +146,7 @@ type Phase struct {

// Artifact tracks objects produced by an action.
type Artifact struct {
CloudObject ArtifactCloudObject `json:"cloudObject"`
KeyValue map[string]string `json:"keyValue"`
}

// CloudObjectProvider is the cloud storage provider.
type CloudObjectProvider string

const (
// CloudObjectProviderGCS means this provider is Google Cloud Storage.
CloudObjectProviderGCS CloudObjectProvider = "GCS"
// CloudObjectProviderS3 means this provider is AWS S3.
CloudObjectProviderS3 CloudObjectProvider = "S3"
)

// ArtifactCloudObject references an object in cloud storage.
type ArtifactCloudObject struct {
Bucket string `json:"bucket"`
Provider CloudObjectProvider `json:"provider"`
Endpoint string `json:"endpoint"`
Path string `json:"path"`
PathType string `json:"pathType"`
Region string `json:"region"`
KeyValue map[string]string `json:"keyValue"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
Expand Down
17 changes: 0 additions & 17 deletions pkg/apis/cr/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions pkg/validate/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,6 @@ func Blueprint(bp *crv1alpha1.Blueprint) error {
return nil
}

// CloudObjectProvider returns an error if op is not a known provider
func CloudObjectProvider(op crv1alpha1.CloudObjectProvider) error {
if op != crv1alpha1.CloudObjectProviderGCS && op != crv1alpha1.CloudObjectProviderS3 {
return errorf("Invalid cloud object provider %s", op)
}
return nil
}

func ProfileSchema(p *crv1alpha1.Profile) error {
if p.Location.Type != crv1alpha1.LocationTypeS3Compliant {
return errorf("unknown or unsupported location type '%s'", p.Location.Type)
Expand Down
16 changes: 0 additions & 16 deletions pkg/validate/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -466,19 +466,3 @@ func (s *ValidateSuite) TestBlueprint(c *C) {
err := Blueprint(nil)
c.Assert(err, IsNil)
}

func (s *ValidateSuite) TestCloudObjectProvider(c *C) {
cases := []struct {
cop crv1alpha1.CloudObjectProvider
checker Checker
}{
{crv1alpha1.CloudObjectProviderGCS, IsNil},
{crv1alpha1.CloudObjectProviderS3, IsNil},
{crv1alpha1.CloudObjectProvider(""), NotNil},
{crv1alpha1.CloudObjectProvider("unsupported provider"), NotNil},
}
for _, tc := range cases {
err := CloudObjectProvider(tc.cop)
c.Assert(err, tc.checker)
}
}

0 comments on commit 2f5e56d

Please sign in to comment.