Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pipelines and docs for CIS compliant tWAS VM Images as Azure Marketplace offerings #65

Merged
merged 40 commits into from
Jan 23, 2023

Conversation

majguo
Copy link
Collaborator

@majguo majguo commented Jan 19, 2023

Description

The PR addresses most of the requirements listed in #64 by providing pipelines and docs for CIS compliant tWAS VM Images as Azure Marketplace offerings.

Testing

CICD pipelines for generating VHD files for CIS compliant tWAS VM Images:

These generated VHD files are also used for updating the testing tWAS VM offer in PartnerCenter. After the testing tWAS VM offer is successfully published and in preview, it's successfully verified by deploying VM from both Azure Portal and solution template.

How-To docs

Part of how-to docs of updating the VM images are located in the following PRs:

The others are included in this PR.

As a result, after the above PRs and this PR are merged, instructions on how to update CIS compliant tWAS VM images can be referenced from howto-update-image.md.

The remaining work

Depending on what images are used in the twas-single and twas-cluster solution template, e.g.,

  • Only CIS compliant images are used
  • Both CIS compliant and non-CIS compliant images, per user selection in UI

(Note: @edburns @m-reza-rahman @git4rk @gcharters) Pls lead the discussion to reach the consensus.)

the following sections need to be updated accordingly:

Signed-off-by: Jianguo Ma [email protected]

majguo added 30 commits January 9, 2023 15:48
Signed-off-by: Jianguo Ma <[email protected]>
Signed-off-by: Jianguo Ma <[email protected]>
Signed-off-by: Jianguo Ma <[email protected]>
Signed-off-by: Jianguo Ma <[email protected]>
Signed-off-by: Jianguo Ma <[email protected]>
Signed-off-by: Jianguo Ma <[email protected]>
Signed-off-by: Jianguo Ma <[email protected]>
Signed-off-by: Jianguo Ma <[email protected]>
Signed-off-by: Jianguo Ma <[email protected]>
majguo and others added 10 commits January 16, 2023 11:12
Signed-off-by: Jianguo Ma <[email protected]>
addtional changes: make action secret MSTEAMS_WEBHOOK as optional

Signed-off-by: Jianguo Ma <[email protected]>
…g in comment.

modified:   .github/workflows/ihs-cisBuild.yml

Signed-off-by: Ed Burns <[email protected]>
…g in comment.

modified:   .github/workflows/twas-base-cisBuild.yml

Signed-off-by: Ed Burns <[email protected]>
modified:   .github/workflows/twas-base-cisBuild.yml
modified:   .github/workflows/twas-nd-cisBuild.yml

Signed-off-by: Ed Burns <[email protected]>
@@ -80,13 +80,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: send notification
if: always()
if: ${{ env.msTeamsWebhook != 'NA' }}
Copy link
Collaborator

Choose a reason for hiding this comment

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

@majguo love this. Thanks.

Comment on lines +24 to +28
azureCredentials: ${{ secrets.AZURE_CREDENTIALS }}
entitledIbmUserId: ${{ secrets.ENTITLED_IBM_USER_ID }}
entitledIbmPassword: ${{ secrets.ENTITLED_IBM_USER_PWD }}
unEntitledIbmUserId: ${{ secrets.UNENTITLED_IBM_USER_ID }}
unEntitledIbmPassword: ${{ secrets.UNENTITLED_IBM_USER_PWD }}
Copy link
Collaborator

Choose a reason for hiding this comment

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

@majguo I appreciate you already including the necessary setup and teardown scripts.

Comment on lines 61 to 62
distribution: 'zulu'
java-version: '8'
Copy link
Collaborator

Choose a reason for hiding this comment

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

I will add a commit to change this to microsoft and 8. Zulu is no longer recommended.

Comment on lines +1 to +5
#!/bin/bash

# Copyright (c) Microsoft Corporation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Copy link
Collaborator

Choose a reason for hiding this comment

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

See #66.

@git4rk git4rk merged commit 752908c into WASdev:main Jan 23, 2023
@majguo majguo deleted the cis branch January 25, 2023 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants