fix(*): revert last two commit (#155)

kleveross · Dec 10, 2020 · eea74a8 · eea74a8
1 parent aee808b
commit eea74a8
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 54 deletions.
diff --git a/cmd/ormb-storage-initializer/cmd/pull-and-export.go b/cmd/ormb-storage-initializer/cmd/pull-and-export.go
@@ -76,7 +76,7 @@ var pullExportCmd = &cobra.Command{
 		}
 
 		// Pull the model from the remote registry.
-		if err := ormbClient.Pull(modelURI, false); err != nil {
+		if err := ormbClient.Pull(modelURI); err != nil {
 			return err
 		}
 		// Export it to the specified directory.

diff --git a/cmd/ormb/cmd/pull.go b/cmd/ormb/cmd/pull.go
@@ -30,7 +30,7 @@ This will store the model in the local registry cache to be used later.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		// TODO(gaocegege): Validate.
 
-		return ormbClient.Pull(args[0], plainHTTPOpt)
+		return ormbClient.Pull(args[0])
 	},
 }
 

diff --git a/cmd/ormb/cmd/push.go b/cmd/ormb/cmd/push.go
@@ -29,7 +29,7 @@ Must first run "ormb save" or "ormb pull".`,
 	PreRunE: preRunE,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		// TODO(gaocegege): Validate.
-		return ormbClient.Push(args[0], plainHTTPOpt)
+		return ormbClient.Push(args[0])
 	},
 }
 

diff --git a/pkg/oras/client.go b/pkg/oras/client.go
@@ -90,11 +90,6 @@ func NewClient(opts ...ClientOption) (Interface, error) {
 	return client, nil
 }
 
-// SetPlainHTTP set plainHTTP opt.
-func (c *Client) SetPlainHTTP(plainHTTP bool) {
-	c.plainHTTP = plainHTTP
-}
-
 // Login logs into a registry
 func (c *Client) Login(hostname string, username string, password string, insecure bool) error {
 	if insecure {

diff --git a/pkg/oras/interface.go b/pkg/oras/interface.go
@@ -7,8 +7,6 @@ import (
 
 // Interface is the interface of the client.
 type Interface interface {
-	SetPlainHTTP(plainHTTP bool)
-
 	Login(hostname string, username string, password string, insecure bool) error
 	Logout(hostname string) error
 	SaveModel(ch *model.Model, ref *oci.Reference) error

diff --git a/pkg/oras/mock/mock.go b/pkg/oras/mock/mock.go
diff --git a/pkg/ormb/mock/mock.go b/pkg/ormb/mock/mock.go
diff --git a/pkg/ormb/ormb.go b/pkg/ormb/ormb.go
@@ -14,8 +14,8 @@ import (
 // models with a remote registry.
 type Interface interface {
 	Login(hostname, username, password string, insecureOpt bool) error
-	Push(refStr string, plainHTTP bool) error
-	Pull(refStr string, plainHTTP bool) error
+	Push(refStr string) error
+	Pull(refStr string) error
 	Export(refStr, dst string) error
 	Save(src, refStr string) error
 	Tag(refStr, targetStr string) error
@@ -41,27 +41,19 @@ func New(opts ...oras.ClientOption) (Interface, error) {
 	}, nil
 }
 
-func (o ORMB) SetPlainHTTP(plainHTTP bool) {
-	o.client.SetPlainHTTP(plainHTTP)
-}
-
 func (o ORMB) Login(hostname, username, password string, insecureOpt bool) error {
 	return o.client.Login(hostname, username, password, insecureOpt)
 }
 
-func (o ORMB) Push(refStr string, plainHTTP bool) error {
-	o.client.SetPlainHTTP(plainHTTP)
-
+func (o ORMB) Push(refStr string) error {
 	ref, err := oci.ParseReference(refStr)
 	if err != nil {
 		return err
 	}
 	return o.client.PushModel(ref)
 }
 
-func (o ORMB) Pull(refStr string, plainHTTP bool) error {
-	o.client.SetPlainHTTP(plainHTTP)
-
+func (o ORMB) Pull(refStr string) error {
 	ref, err := oci.ParseReference(refStr)
 	if err != nil {
 		return err

diff --git a/pkg/ormb/ormb_test.go b/pkg/ormb/ormb_test.go
@@ -50,10 +50,7 @@ var _ = Describe("ormb golang library", func() {
 		ociORMB.client.(*orasmock.MockInterface).EXPECT().PushModel(
 			gomock.Eq(ref),
 		).Return(nil).Times(1)
-		ociORMB.client.(*orasmock.MockInterface).EXPECT().SetPlainHTTP(
-			true,
-		).Times(1)
-		Expect(ociORMB.Push(refStr, true)).To(BeNil())
+		Expect(ociORMB.Push(refStr)).To(BeNil())
 	})
 
 	It("Should pull the model successfully", func() {
@@ -64,10 +61,7 @@ var _ = Describe("ormb golang library", func() {
 		ociORMB.client.(*orasmock.MockInterface).EXPECT().PullModel(
 			gomock.Eq(ref),
 		).Return(nil).Times(1)
-		ociORMB.client.(*orasmock.MockInterface).EXPECT().SetPlainHTTP(
-			true,
-		).Times(1)
-		Expect(ociORMB.Pull(refStr, true)).To(BeNil())
+		Expect(ociORMB.Pull(refStr)).To(BeNil())
 	})
 
 	It("Should save the model successfully", func() {