From 051caac33ca4976d9af50e0895d1868fd69d2553 Mon Sep 17 00:00:00 2001 From: netal Date: Wed, 13 Oct 2021 16:35:55 -0700 Subject: [PATCH 1/3] Update the Type field name to PolicyType for SetPolicy Signed-off-by: netal --- hcn/hcnpolicy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hcn/hcnpolicy.go b/hcn/hcnpolicy.go index c2aa599f33..891352a78c 100644 --- a/hcn/hcnpolicy.go +++ b/hcn/hcnpolicy.go @@ -292,7 +292,7 @@ const ( type SetPolicySetting struct { Id string Name string - Type SetPolicyType + PolicyType SetPolicyType Values string } From 135b56cad05d4e0bfc19956cc16c550619efa717 Mon Sep 17 00:00:00 2001 From: netal Date: Thu, 14 Oct 2021 10:56:55 -0700 Subject: [PATCH 2/3] Resolving CI test vendor issues Signed-off-by: netal --- test/vendor/github.com/Microsoft/hcsshim/hcn/hcnpolicy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/vendor/github.com/Microsoft/hcsshim/hcn/hcnpolicy.go b/test/vendor/github.com/Microsoft/hcsshim/hcn/hcnpolicy.go index c2aa599f33..891352a78c 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/hcn/hcnpolicy.go +++ b/test/vendor/github.com/Microsoft/hcsshim/hcn/hcnpolicy.go @@ -292,7 +292,7 @@ const ( type SetPolicySetting struct { Id string Name string - Type SetPolicyType + PolicyType SetPolicyType Values string } From 33b39e93f5b8182dad4fa64a9a24604e542db183 Mon Sep 17 00:00:00 2001 From: netal Date: Mon, 18 Oct 2021 15:02:26 -0700 Subject: [PATCH 3/3] adding json struct tag to have it be marshalled to the PolicyType name Signed-off-by: netal --- hcn/hcnpolicy.go | 2 +- test/vendor/github.com/Microsoft/hcsshim/hcn/hcnpolicy.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hcn/hcnpolicy.go b/hcn/hcnpolicy.go index 891352a78c..9a90d534e9 100644 --- a/hcn/hcnpolicy.go +++ b/hcn/hcnpolicy.go @@ -292,7 +292,7 @@ const ( type SetPolicySetting struct { Id string Name string - PolicyType SetPolicyType + Type SetPolicyType `json:"PolicyType"` Values string } diff --git a/test/vendor/github.com/Microsoft/hcsshim/hcn/hcnpolicy.go b/test/vendor/github.com/Microsoft/hcsshim/hcn/hcnpolicy.go index 891352a78c..9a90d534e9 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/hcn/hcnpolicy.go +++ b/test/vendor/github.com/Microsoft/hcsshim/hcn/hcnpolicy.go @@ -292,7 +292,7 @@ const ( type SetPolicySetting struct { Id string Name string - PolicyType SetPolicyType + Type SetPolicyType `json:"PolicyType"` Values string }