From 4aac03bf7f609619a98a99c459cc27c8dc0232c3 Mon Sep 17 00:00:00 2001 From: Adhishree Kadam <118783118+adhishreekadam@users.noreply.github.com> Date: Thu, 6 Jun 2024 19:04:44 -0400 Subject: [PATCH 1/4] deleted publish-service-policy and publish-depolyment-policy Signed-off-by: Adhishree Kadam <118783118+adhishreekadam@users.noreply.github.com> --- Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7afcb19..38fb628 100644 --- a/Makefile +++ b/Makefile @@ -48,11 +48,6 @@ sbom-policy-gen: @echo "==================" ./sbom-property-gen.sh -publish-service-policy: - hzn exchange service addpolicy -f service.policy.json $(HZN_ORG_ID)/$(SERVICE_NAME)_$(SERVICE_VERSION)_$(ARCH) - -publish-deployment-policy: - hzn exchange deployment addpolicy -f deployment.policy.json $(HZN_ORG_ID)/policy-$(SERVICE_NAME)_$(SERVICE_VERSION) test: run @echo "==================" @@ -98,4 +93,4 @@ agent-stop: deploy-check: @hzn deploycheck all -t device -B deployment.policy.json --service-pol=service.policy.json --node-pol=node.policy.json -.PHONY: build dev run push publish-service publish-pattern test stop clean agent-run agent-stop \ No newline at end of file +.PHONY: build dev run push publish-service publish-pattern test stop clean agent-run agent-stop From 76770172ea888116444d190e7bd1ad684c8b76c3 Mon Sep 17 00:00:00 2001 From: Adhishree Kadam <118783118+adhishreekadam@users.noreply.github.com> Date: Thu, 6 Jun 2024 19:05:20 -0400 Subject: [PATCH 2/4] Deleted node.policy.json Signed-off-by: Adhishree Kadam <118783118+adhishreekadam@users.noreply.github.com> --- node.policy.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 node.policy.json diff --git a/node.policy.json b/node.policy.json deleted file mode 100644 index 1aec2e6..0000000 --- a/node.policy.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "properties": [ - { "name": "example", "value": "web-helloworld-python" } - ], - "constraints": [ - "itsdangerous != 2.1.2" - ] -} From ae70c15bd8a6c57397bf64663be93089aac4df0f Mon Sep 17 00:00:00 2001 From: Adhishree Kadam <118783118+adhishreekadam@users.noreply.github.com> Date: Thu, 6 Jun 2024 19:11:22 -0400 Subject: [PATCH 3/4] added publish-service-policy back Signed-off-by: Adhishree Kadam <118783118+adhishreekadam@users.noreply.github.com> --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 38fb628..d778172 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,9 @@ publish-pattern: PATTERN_NAME="$(PATTERN_NAME)" \ hzn exchange pattern publish -f pattern.json +publish-service-policy: + hzn exchange service addpolicy -f service.policy.json $(HZN_ORG_ID)/$(SERVICE_NAME)_$(SERVICE_VERSION)_$(ARCH) + stop: @docker rm -f ${SERVICE_NAME} >/dev/null 2>&1 || : From ba379fd6468035ad1ea3a7b43d249c6e8d4cdb20 Mon Sep 17 00:00:00 2001 From: Adhishree Kadam <118783118+adhishreekadam@users.noreply.github.com> Date: Thu, 6 Jun 2024 19:12:55 -0400 Subject: [PATCH 4/4] Update Makefile Signed-off-by: Adhishree Kadam <118783118+adhishreekadam@users.noreply.github.com> --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d778172..08c3fc8 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,9 @@ sbom-policy-gen: @echo "==================" ./sbom-property-gen.sh +publish-service-policy: + hzn exchange service addpolicy -f service.policy.json $(HZN_ORG_ID)/$(SERVICE_NAME)_$(SERVICE_VERSION)_$(ARCH) + test: run @echo "==================" @@ -78,8 +81,6 @@ publish-pattern: PATTERN_NAME="$(PATTERN_NAME)" \ hzn exchange pattern publish -f pattern.json -publish-service-policy: - hzn exchange service addpolicy -f service.policy.json $(HZN_ORG_ID)/$(SERVICE_NAME)_$(SERVICE_VERSION)_$(ARCH) stop: @docker rm -f ${SERVICE_NAME} >/dev/null 2>&1 || :