Merge pull request #10 from datadrivers/v0.6.1

v0.6.1

blobstore.go

@@ -110,13 +110,11 @@ func (c client) BlobstoreRead(id string) (*Blobstore, error) {
 				return nil, err
 			}
 
-			bsDetailed.Name = bs.Name
-			bsDetailed.Type = bs.Type
+			bsDetailed.AvailableSpaceInBytes = bs.AvailableSpaceInBytes
 			bsDetailed.BlobCount = bs.BlobCount
+			bsDetailed.Name = bs.Name
 			bsDetailed.TotalSizeInBytes = bs.TotalSizeInBytes
-			bsDetailed.AvailableSpaceInBytes = bs.AvailableSpaceInBytes
-
-			bs.Name = bsDetailed.Name
+			bsDetailed.Type = bs.Type
 
 			return bsDetailed, nil
 		}

blobstore_test.go

@@ -59,6 +59,7 @@ func TestBlobstoreRead(t *testing.T) {
 
 	if bs != nil {
 		assert.Equal(t, bsName, bs.Name)
+		assert.NotEqual(t, "", bs.Path)
 	}
 }
 
@@ -89,11 +90,13 @@ func TestBlobstoreS3(t *testing.T) {
 	s3BS, err := client.BlobstoreRead(bs.Name)
 	assert.Nil(t, err)
 	assert.NotNil(t, s3BS)
-	assert.Equal(t, BlobstoreTypeS3, s3BS.Type)
-	assert.NotNil(t, s3BS.BlobstoreS3BucketConfiguration)
-	assert.NotNil(t, s3BS.BlobstoreS3BucketConfiguration.BlobstoreS3Bucket)
-	assert.NotNil(t, s3BS.BlobstoreS3BucketConfiguration.BlobstoreS3BucketSecurity)
+	if s3BS != nil {
+		assert.Equal(t, BlobstoreTypeS3, s3BS.Type)
+		assert.NotNil(t, s3BS.BlobstoreS3BucketConfiguration)
+		assert.NotNil(t, s3BS.BlobstoreS3BucketConfiguration.BlobstoreS3Bucket)
+		assert.NotNil(t, s3BS.BlobstoreS3BucketConfiguration.BlobstoreS3BucketSecurity)
 
-	err = client.BlobstoreDelete(bs.Name)
-	assert.Nil(t, err)
+		err = client.BlobstoreDelete(bs.Name)
+		assert.Nil(t, err)
+	}
 }

repository.go

@@ -146,9 +146,9 @@ type RepositoryProxy struct {
 
 // RepositoryStorage contains repository storage
 type RepositoryStorage struct {
-	BlobStoreName               string  `json:"blobStoreName"`
-	StrictContentTypeValidation bool    `json:"strictContentTypeValidation"`
-	WritePolicy                 *string `json:"writePolicy,omitempty"`
+	BlobStoreName               string `json:"blobStoreName"`
+	StrictContentTypeValidation bool   `json:"strictContentTypeValidation"`
+	WritePolicy                 string `json:"writePolicy,omitempty"`
 }
 
 func jsonUnmarshalRepositories(data []byte) ([]Repository, error) {

repository_test.go

@@ -82,8 +82,6 @@ func testJSONUnmarshalRepositories() string {
 }
 
 func getTestRepositoryAptHosted(name string) Repository {
-	writePolicy := "ALLOW_ONCE"
-
 	return Repository{
 		Name:   name,
 		Online: true,
@@ -103,7 +101,7 @@ func getTestRepositoryAptHosted(name string) Repository {
 		RepositoryStorage: &RepositoryStorage{
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
-			WritePolicy:                 &writePolicy,
+			WritePolicy:                 "ALLOW",
 		},
 	}
 }
@@ -130,7 +128,7 @@ func getTestRepositoryDockerHostedWithPorts(name string) Repository {
 	httpsPort := new(int)
 	*httpPort = 8082
 	*httpsPort = 8083
-	writePolicy := "ALLOW_ONCE"
+	writePolicy := "ALLOW"
 
 	return Repository{
 		Name:   name,
@@ -149,7 +147,7 @@ func getTestRepositoryDockerHostedWithPorts(name string) Repository {
 		RepositoryStorage: &RepositoryStorage{
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
-			WritePolicy:                 &writePolicy,
+			WritePolicy:                 writePolicy,
 		},
 	}
 }
@@ -172,8 +170,6 @@ func TestRepositoryDockerHostedWithPorts(t *testing.T) {
 }
 
 func getTestRepositoryDockerHostedWithoutPorts(name string) Repository {
-	writePolicy := "ALLOW_ONCE"
-
 	return Repository{
 		Name:   name,
 		Online: true,
@@ -189,7 +185,7 @@ func getTestRepositoryDockerHostedWithoutPorts(name string) Repository {
 		RepositoryStorage: &RepositoryStorage{
 			BlobStoreName:               "default",
 			StrictContentTypeValidation: true,
-			WritePolicy:                 &writePolicy,
+			WritePolicy:                 "ALLOW_ONCE",
 		},
 	}
 }