From eb0cc25755569ca6fcb06f1ef54edd9c976cce82 Mon Sep 17 00:00:00 2001
From: John Starks <jostarks@ntdev.microsoft.com>
Date: Tue, 15 May 2018 16:02:16 -0700
Subject: [PATCH] Move oci/wclayer to internal for now

We may want to iterate on this interface a bit before we support it
outside of hcsshim.
---
 cmd/wclayer/export.go                          | 4 ++--
 cmd/wclayer/import.go                          | 4 ++--
 {oci/wclayer => internal/ociwclayer}/export.go | 4 ++--
 {oci/wclayer => internal/ociwclayer}/import.go | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename {oci/wclayer => internal/ociwclayer}/export.go (95%)
 rename {oci/wclayer => internal/ociwclayer}/import.go (99%)

diff --git a/cmd/wclayer/export.go b/cmd/wclayer/export.go
index c523856f51..1eba0ee635 100644
--- a/cmd/wclayer/export.go
+++ b/cmd/wclayer/export.go
@@ -8,7 +8,7 @@ import (
 
 	winio "github.com/Microsoft/go-winio"
 	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/oci/wclayer"
+	"github.com/Microsoft/hcsshim/internal/ociwclayer"
 	"github.com/urfave/cli"
 )
 
@@ -61,6 +61,6 @@ var exportCommand = cli.Command{
 			w = gzip.NewWriter(w)
 		}
 
-		return wclayer.ExportLayer(w, path, layers)
+		return ociwclayer.ExportLayer(w, path, layers)
 	},
 }
diff --git a/cmd/wclayer/import.go b/cmd/wclayer/import.go
index 4ce0cdce8b..011dc054a5 100644
--- a/cmd/wclayer/import.go
+++ b/cmd/wclayer/import.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/Microsoft/go-winio"
 	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/oci/wclayer"
+	"github.com/Microsoft/hcsshim/internal/ociwclayer"
 	"github.com/urfave/cli"
 )
 
@@ -56,7 +56,7 @@ var importCommand = cli.Command{
 		if err != nil {
 			return err
 		}
-		_, err = wclayer.ImportLayer(r, path, layers)
+		_, err = ociwclayer.ImportLayer(r, path, layers)
 		return err
 	},
 }
diff --git a/oci/wclayer/export.go b/internal/ociwclayer/export.go
similarity index 95%
rename from oci/wclayer/export.go
rename to internal/ociwclayer/export.go
index a895e52532..0b5d0dcdc9 100644
--- a/oci/wclayer/export.go
+++ b/internal/ociwclayer/export.go
@@ -1,6 +1,6 @@
-// Package wclayer provides functions for importing and exporting Windows
+// Package ociwclayer provides functions for importing and exporting Windows
 // container layers from and to their OCI tar representation.
-package wclayer
+package ociwclayer
 
 import (
 	"io"
diff --git a/oci/wclayer/import.go b/internal/ociwclayer/import.go
similarity index 99%
rename from oci/wclayer/import.go
rename to internal/ociwclayer/import.go
index 4b2dce01e5..0af29ba71d 100644
--- a/oci/wclayer/import.go
+++ b/internal/ociwclayer/import.go
@@ -1,4 +1,4 @@
-package wclayer
+package ociwclayer
 
 import (
 	"bufio"