[cloud_security_posture] Seperate cloud formation templates for CSPM and CNVM #6899

jeniawhite · 2023-07-10T20:07:01Z

What does this PR do?

Direct the user to different cloud formation templates instead of a single template with params

Checklist

I have reviewed tips for building integrations and this pull request is aligned with them.
I have verified that all data streams collect metrics or logs.
I have added an entry to my package's changelog.yml file.
I have verified that Kibana version constraints are current according to guidelines.

Related issues

elasticmachine · 2023-07-10T20:17:56Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2023-07-19T10:54:02.593+0000
Duration: 14 min 20 sec

Test stats 🧪

Test	Results
Failed	0
Passed	4
Skipped	0
Total	4

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.

oren-zohar · 2023-07-10T21:13:29Z

packages/cloud_security_posture/changelog.yml

+  changes:
+    - description: Seperate KSPM and CSPM cloudformation templates
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/XXXX


I always like to look at the last PR that was open before submitting the change and predict the right link lol

oren-zohar · 2023-07-12T11:54:29Z

packages/cloud_security_posture/manifest.yml

@@ -112,7 +112,7 @@ policy_templates:
            required: true
            show_user: false
            description: Template URL to Cloud Formation Quick Create Stack
-            default: https://console.aws.amazon.com/cloudformation/home#/stacks/quickcreate?templateURL=https://elastic-cspm-cft.s3.eu-central-1.amazonaws.com/cloudformation-8.10.0-2023-06-26-13-36-58.yml&stackName=Elastic-Cloud-Security-Posture-Management&param_EnrollmentToken=FLEET_ENROLLMENT_TOKEN&param_FleetUrl=FLEET_URL&param_ElasticAgentVersion=KIBANA_VERSION&param_ElasticArtifactServer=https://artifacts.elastic.co/downloads/beats/elastic-agent&param_Integration=CloudSecurityPostureManagement
+            default: https://console.aws.amazon.com/cloudformation/home#/stacks/quickcreate?templateURL=https://elastic-cspm-cft.s3.eu-central-1.amazonaws.com/cloudformation-cspm-8.10.0-2023-06-26-13-36-58.yml&stackName=Elastic-Cloud-Security-Posture-Management&param_EnrollmentToken=FLEET_ENROLLMENT_TOKEN&param_FleetUrl=FLEET_URL&param_ElasticAgentVersion=KIBANA_VERSION&param_ElasticArtifactServer=https://artifacts.elastic.co/downloads/beats/elastic-agent


why did you remove param_Integration?

Because we do not have a dynamic template anymore, and this variable was being used in order to know what template to generate.
If you notice we now have two separate templates and two separate links.

oren-zohar · 2023-07-13T07:40:34Z

packages/cloud_security_posture/manifest.yml

need to update the version

amirbenun

you should only merge it after you merge https://github.com/elastic/cloudbeat/pull/1125/files and trigger a new file upload to S3

amirbenun · 2023-07-16T08:24:55Z

packages/cloud_security_posture/manifest.yml

@@ -112,7 +112,7 @@ policy_templates:
            required: true
            show_user: false
            description: Template URL to Cloud Formation Quick Create Stack
-            default: https://console.aws.amazon.com/cloudformation/home#/stacks/quickcreate?templateURL=https://elastic-cspm-cft.s3.eu-central-1.amazonaws.com/cloudformation-8.10.0-2023-06-26-13-36-58.yml&stackName=Elastic-Cloud-Security-Posture-Management&param_EnrollmentToken=FLEET_ENROLLMENT_TOKEN&param_FleetUrl=FLEET_URL&param_ElasticAgentVersion=KIBANA_VERSION&param_ElasticArtifactServer=https://artifacts.elastic.co/downloads/beats/elastic-agent&param_Integration=CloudSecurityPostureManagement
+            default: https://console.aws.amazon.com/cloudformation/home#/stacks/quickcreate?templateURL=https://elastic-cspm-cft.s3.eu-central-1.amazonaws.com/cloudformation-cspm-8.10.0-2023-06-26-13-36-58.yml&stackName=Elastic-Cloud-Security-Posture-Management&param_EnrollmentToken=FLEET_ENROLLMENT_TOKEN&param_FleetUrl=FLEET_URL&param_ElasticAgentVersion=KIBANA_VERSION&param_ElasticArtifactServer=https://artifacts.elastic.co/downloads/beats/elastic-agent


This won't work since this file does not exist yet in S3

Yeah, this is why this PR is still open.

Create different templates for CSPM and CNVM cloudbeat#1125

Is in the related PRs and is blocking the merge of this PR.

amirbenun · 2023-07-19T10:47:49Z

packages/cloud_security_posture/changelog.yml

 - version: "1.5.0-preview22"
  changes:


Suggested change

- version: "1.5.0-preview22"

changes:

elasticmachine · 2023-07-19T10:58:27Z

🌐 Coverage report

Name	Metrics % (`covered/total`)	Diff
Packages	100.0% (`0/0`)	💚
Files	100.0% (`0/0`)	💚
Classes	100.0% (`0/0`)	💚
Methods	25.0% (`2/8`)	👎 -63.889
Lines	100.0% (`0/0`)	💚 6.027
Conditionals	100.0% (`0/0`)	💚

elasticmachine · 2023-07-19T11:55:18Z

Package cloud_security_posture - 1.5.0-preview23 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-07-24T17:29:56Z

Package cloud_security_posture - 1.5.0-preview24 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-07-25T12:37:13Z

Package cloud_security_posture - 1.5.0-preview25 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-07-30T06:19:35Z

Package cloud_security_posture - 1.5.0-preview26 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-07-31T14:35:46Z

Package cloud_security_posture - 1.5.0-preview27 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-08-21T10:51:27Z

Package cloud_security_posture - 1.5.0 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

jeniawhite added the enhancement New feature or request label Jul 10, 2023

jeniawhite requested a review from a team as a code owner July 10, 2023 20:07

oren-zohar reviewed Jul 10, 2023

View reviewed changes

jeniawhite added 2 commits July 12, 2023 14:37

Template changes

fa2c3d3

Update bucket name

9a0e0f9

jeniawhite force-pushed the evgb-TemplateChange branch from 42c26f5 to 9a0e0f9 Compare July 12, 2023 11:38

oren-zohar requested changes Jul 12, 2023

View reviewed changes

jeniawhite requested a review from oren-zohar July 13, 2023 06:44

oren-zohar approved these changes Jul 13, 2023

View reviewed changes

packages/cloud_security_posture/manifest.yml

Copy link

Contributor

oren-zohar Jul 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to update the version

jeniawhite reacted with thumbs up emoji

Update version

df29f80

amirbenun requested changes Jul 16, 2023

View reviewed changes

jeniawhite requested a review from amirbenun July 16, 2023 16:57

jeniawhite changed the title ~~Seperate cloud formation templates for CSPM and CNVM~~ [cloud_security_posture] Seperate cloud formation templates for CSPM and CNVM Jul 18, 2023

jeniawhite added Team:Cloud Security Label for the Cloud Security team [elastic/cloud-security-posture] Integration:cloud_security_posture Security Posture Management and removed Team:Cloud Security Label for the Cloud Security team [elastic/cloud-security-posture] labels Jul 18, 2023

Update links

4ae0fcb

amirbenun reviewed Jul 19, 2023

View reviewed changes

Change version

7f4a5d7

amirbenun approved these changes Jul 19, 2023

View reviewed changes

jeniawhite merged commit b4683bd into elastic:main Jul 19, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[cloud_security_posture] Seperate cloud formation templates for CSPM and CNVM #6899

[cloud_security_posture] Seperate cloud formation templates for CSPM and CNVM #6899

jeniawhite commented Jul 10, 2023 •

edited

Loading

elasticmachine commented Jul 10, 2023 •

edited

Loading

Build stats

Test stats 🧪

oren-zohar Jul 10, 2023

oren-zohar Jul 12, 2023

jeniawhite Jul 13, 2023

oren-zohar Jul 13, 2023

amirbenun left a comment

amirbenun Jul 16, 2023

jeniawhite Jul 16, 2023 •

edited

Loading

amirbenun Jul 19, 2023

elasticmachine commented Jul 19, 2023 •

edited

Loading

elasticmachine commented Jul 19, 2023

elasticmachine commented Jul 24, 2023

elasticmachine commented Jul 25, 2023

elasticmachine commented Jul 30, 2023

elasticmachine commented Jul 31, 2023

elasticmachine commented Aug 21, 2023

[cloud_security_posture] Seperate cloud formation templates for CSPM and CNVM #6899

[cloud_security_posture] Seperate cloud formation templates for CSPM and CNVM #6899

Conversation

jeniawhite commented Jul 10, 2023 • edited Loading

What does this PR do?

Checklist

Related issues

elasticmachine commented Jul 10, 2023 • edited Loading

💚 Build Succeeded

Build stats

Test stats 🧪

🤖 GitHub comments

oren-zohar Jul 10, 2023

Choose a reason for hiding this comment

oren-zohar Jul 12, 2023

Choose a reason for hiding this comment

jeniawhite Jul 13, 2023

Choose a reason for hiding this comment

oren-zohar Jul 13, 2023

Choose a reason for hiding this comment

amirbenun left a comment

Choose a reason for hiding this comment

amirbenun Jul 16, 2023

Choose a reason for hiding this comment

jeniawhite Jul 16, 2023 • edited Loading

Choose a reason for hiding this comment

amirbenun Jul 19, 2023

Choose a reason for hiding this comment

elasticmachine commented Jul 19, 2023 • edited Loading

🌐 Coverage report

elasticmachine commented Jul 19, 2023

elasticmachine commented Jul 24, 2023

elasticmachine commented Jul 25, 2023

elasticmachine commented Jul 30, 2023

elasticmachine commented Jul 31, 2023

elasticmachine commented Aug 21, 2023

jeniawhite commented Jul 10, 2023 •

edited

Loading

elasticmachine commented Jul 10, 2023 •

edited

Loading

jeniawhite Jul 16, 2023 •

edited

Loading

elasticmachine commented Jul 19, 2023 •

edited

Loading