Remove OS() from layer interface

John Howard · John Howard · commit c94d34f78394 · 2018-01-18T12:56:28.000-08:00
Signed-off-by: John Howard &lt;jhoward@microsoft.com&gt;
diff --git a/distribution/xfer/download_test.go b/distribution/xfer/download_test.go
@@ -57,10 +57,6 @@ func (ml *mockLayer) DiffSize() (size int64, err error) {
 	return 0, nil
 }
 
-func (ml *mockLayer) OS() string {
-	return ml.os
-}
-
 func (ml *mockLayer) Metadata() (map[string]string, error) {
 	return make(map[string]string), nil
 }
@@ -158,10 +154,6 @@ func (ls *mockLayerStore) DriverName() string {
 	return "mock"
 }
 
-func (ls *mockLayerStore) OS() string {
-	return runtime.GOOS
-}
-
 type mockDownloadDescriptor struct {
 	currentDownloads *int32
 	id               string
diff --git a/image/store.go b/image/store.go
@@ -224,6 +224,13 @@ func (is *store) Delete(id ID) ([]layer.Metadata, error) {
 	if imageMeta == nil {
 		return nil, fmt.Errorf("unrecognized image ID %s", id.String())
 	}
+	img, err := is.Get(id)
+	if err != nil {
+		return nil, fmt.Errorf("unrecognized image %s, %v", id.String(), err)
+	}
+	if !system.IsOSSupported(img.OperatingSystem()) {
+		return nil, fmt.Errorf("unsupported image operating system %q", img.OperatingSystem())
+	}
 	for id := range imageMeta.children {
 		is.fs.DeleteMetadata(id.Digest(), "parent")
 	}
@@ -238,7 +245,7 @@ func (is *store) Delete(id ID) ([]layer.Metadata, error) {
 	is.fs.Delete(id.Digest())
 
 	if imageMeta.layer != nil {
-		return is.lss[imageMeta.layer.OS()].Release(imageMeta.layer)
+		return is.lss[img.OperatingSystem()].Release(imageMeta.layer)
 	}
 	return nil, nil
 }
diff --git a/layer/empty.go b/layer/empty.go
@@ -43,10 +43,6 @@ func (el *emptyLayer) Parent() Layer {
 	return nil
 }
 
-func (el *emptyLayer) OS() string {
-	return ""
-}
-
 func (el *emptyLayer) Size() (size int64, err error) {
 	return 0, nil
 }
diff --git a/layer/layer.go b/layer/layer.go
@@ -100,9 +100,6 @@ type Layer interface {
 	// Parent returns the next layer in the layer chain.
 	Parent() Layer
 
-	// OS returns the operating system of the layer
-	OS() string
-
 	// Size returns the size of the entire layer chain. The size
 	// is calculated from the total size of all files in the layers.
 	Size() (int64, error)
@@ -148,9 +145,6 @@ type RWLayer interface {
 
 	// Metadata returns the low level metadata for the mutable layer
 	Metadata() (map[string]string, error)
-
-	// OS returns the operating system of the writable layer
-	OS() string
 }
 
 // Metadata holds information about a
@@ -199,7 +193,6 @@ type Store interface {
 	Cleanup() error
 	DriverStatus() [][2]string
 	DriverName() string
-	OS() string
 }
 
 // DescribableStore represents a layer store capable of storing
diff --git a/layer/layer_store.go b/layer/layer_store.go
@@ -725,10 +725,6 @@ func (ls *layerStore) DriverName() string {
 	return ls.driver.String()
 }
 
-func (ls *layerStore) OS() string {
-	return ls.os
-}
-
 type naiveDiffPathDriver struct {
 	graphdriver.Driver
 }
diff --git a/layer/mounted_layer.go b/layer/mounted_layer.go
@@ -46,10 +46,6 @@ func (ml *mountedLayer) Parent() Layer {
 	return nil
 }
 
-func (ml *mountedLayer) OS() string {
-	return ml.layerStore.os
-}
-
 func (ml *mountedLayer) Size() (int64, error) {
 	return ml.layerStore.driver.DiffSize(ml.mountID, ml.cacheParent())
 }
diff --git a/layer/ro_layer.go b/layer/ro_layer.go
@@ -69,10 +69,6 @@ func (rl *roLayer) Parent() Layer {
 	return rl.parent
 }
 
-func (rl *roLayer) OS() string {
-	return rl.layerStore.os
-}
-
 func (rl *roLayer) Size() (size int64, err error) {
 	if rl.parent != nil {
 		size, err = rl.parent.Size()
diff --git a/migrate/v1/migratev1_test.go b/migrate/v1/migratev1_test.go
@@ -432,10 +432,6 @@ func (l *mockLayer) DiffSize() (int64, error) {
 	return 0, nil
 }
 
-func (l *mockLayer) OS() string {
-	return ""
-}
-
 func (l *mockLayer) Metadata() (map[string]string, error) {
 	return nil, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,6 @@ func (ml *mockLayer) DiffSize() (size int64, err error) {`
`57`	`57`	`return 0, nil`
`58`	`58`	`}`
`59`	`59`
`60`		`-func (ml *mockLayer) OS() string {`
`61`		`- return ml.os`
`62`		`-}`
`63`		`-`
`64`	`60`	`func (ml *mockLayer) Metadata() (map[string]string, error) {`
`65`	`61`	`return make(map[string]string), nil`
`66`	`62`	`}`
`@@ -158,10 +154,6 @@ func (ls *mockLayerStore) DriverName() string {`
`158`	`154`	`return "mock"`
`159`	`155`	`}`
`160`	`156`
`161`		`-func (ls *mockLayerStore) OS() string {`
`162`		`- return runtime.GOOS`
`163`		`-}`
`164`		`-`
`165`	`157`	`type mockDownloadDescriptor struct {`
`166`	`158`	`currentDownloads *int32`
`167`	`159`	`id string`
Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,13 @@ func (is *store) Delete(id ID) ([]layer.Metadata, error) {`
`224`	`224`	`if imageMeta == nil {`
`225`	`225`	`return nil, fmt.Errorf("unrecognized image ID %s", id.String())`
`226`	`226`	`}`
	`227`	`+ img, err := is.Get(id)`
	`228`	`+ if err != nil {`
	`229`	`+ return nil, fmt.Errorf("unrecognized image %s, %v", id.String(), err)`
	`230`	`+ }`
	`231`	`+ if !system.IsOSSupported(img.OperatingSystem()) {`
	`232`	`+ return nil, fmt.Errorf("unsupported image operating system %q", img.OperatingSystem())`
	`233`	`+ }`
`227`	`234`	`for id := range imageMeta.children {`
`228`	`235`	`is.fs.DeleteMetadata(id.Digest(), "parent")`
`229`	`236`	`}`
`@@ -238,7 +245,7 @@ func (is *store) Delete(id ID) ([]layer.Metadata, error) {`
`238`	`245`	`is.fs.Delete(id.Digest())`
`239`	`246`
`240`	`247`	`if imageMeta.layer != nil {`
`241`		`- return is.lss[imageMeta.layer.OS()].Release(imageMeta.layer)`
	`248`	`+ return is.lss[img.OperatingSystem()].Release(imageMeta.layer)`
`242`	`249`	`}`
`243`	`250`	`return nil, nil`
`244`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,6 @@ func (el *emptyLayer) Parent() Layer {`
`43`	`43`	`return nil`
`44`	`44`	`}`
`45`	`45`
`46`		`-func (el *emptyLayer) OS() string {`
`47`		`- return ""`
`48`		`-}`
`49`		`-`
`50`	`46`	`func (el *emptyLayer) Size() (size int64, err error) {`
`51`	`47`	`return 0, nil`
`52`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -725,10 +725,6 @@ func (ls *layerStore) DriverName() string {`
`725`	`725`	`return ls.driver.String()`
`726`	`726`	`}`
`727`	`727`
`728`		`-func (ls *layerStore) OS() string {`
`729`		`- return ls.os`
`730`		`-}`
`731`		`-`
`732`	`728`	`type naiveDiffPathDriver struct {`
`733`	`729`	`graphdriver.Driver`
`734`	`730`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,6 @@ func (ml *mountedLayer) Parent() Layer {`
`46`	`46`	`return nil`
`47`	`47`	`}`
`48`	`48`
`49`		`-func (ml *mountedLayer) OS() string {`
`50`		`- return ml.layerStore.os`
`51`		`-}`
`52`		`-`
`53`	`49`	`func (ml *mountedLayer) Size() (int64, error) {`
`54`	`50`	`return ml.layerStore.driver.DiffSize(ml.mountID, ml.cacheParent())`
`55`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -432,10 +432,6 @@ func (l *mockLayer) DiffSize() (int64, error) {`
`432`	`432`	`return 0, nil`
`433`	`433`	`}`
`434`	`434`
`435`		`-func (l *mockLayer) OS() string {`
`436`		`- return ""`
`437`		`-}`
`438`		`-`
`439`	`435`	`func (l *mockLayer) Metadata() (map[string]string, error) {`
`440`	`436`	`return nil, nil`
`441`	`437`	`}`