diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index dea02d6..76e686b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -76,16 +76,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: 18.14 - name: Setup npm run: npm install -g npm@8.19.3 - uses: actions/cache/restore@v3 with: path: node_modules key: ${{ runner.os }}-build-cache-node-modules-${{ hashFiles('./package-lock.json') }} + - name: Setup Node + uses: actions/setup-node@v3 + with: + node-version: 18.14 - name: Run unit tests run: export NODE_OPTIONS=--max_old_space_size=8192 && npm run test - name: Upload line coverage report @@ -128,7 +128,6 @@ jobs: steps: - uses: actions/checkout@v3 with: - # Disabling shallow clone is recommended for improving relevancy of reporting fetch-depth: 0 - name: Download line coverage report uses: actions/download-artifact@v3 @@ -156,14 +155,14 @@ jobs: path: node_modules key: ${{ runner.os }}-build-cache-node-modules-${{ hashFiles('./package-lock.json') }} - name: Build application - run: | - npm install -g npm@8.19.3 && \ - npm ci && \ - npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.2.5" && \ - npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.7.0" && \ - npm run plugin:init && \ - docker build -t leto-modelizer -f DockerfileE2E . + run: npm install -g npm@8.19.3 && \ +npm ci && \ +npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.2.5" && \ +npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.7.0" && \ +npm run plugin:init && \ +docker build -t leto-modelizer -f DockerfileE2E . + - name: Run application run: docker run -p 8080:80 -d leto-modelizer - name: Run functional tests - run: npm run test:e2e \ No newline at end of file + run: npm run test:e2e diff --git a/.github/workflows/test CI.yml b/.github/workflows/test CI.yml new file mode 100644 index 0000000..4cb9a1e --- /dev/null +++ b/.github/workflows/test CI.yml @@ -0,0 +1,13 @@ +name: Test CI + +on: + pull_request: + types: [synchronized, opened] + +jobs: + job_1: + name: Test Job + runs-on: ubuntu-latest + steps: + - name: echo step + run: echo 'Workflow started' diff --git a/leto-modelizer.config.json b/leto-modelizer.config.json index 4b2167c..bae60e5 100644 --- a/leto-modelizer.config.json +++ b/leto-modelizer.config.json @@ -226,8 +226,8 @@ ".github/workflows/CI.yml": { "githubator-plugin": { "workflow_1": { - "x": -428.9666748046875, - "y": 0.1168212890625, + "x": -1165.4167404174805, + "y": -354.5368194580078, "width": 3345, "height": 1890, "needsResizing": false, @@ -640,5 +640,107 @@ "manuallyResized": false } } + }, + ".github/workflows": { + "githubator-plugin": { + "workflow_1": { + "x": 199, + "y": 259, + "width": 250, + "height": 480, + "needsResizing": false, + "needsPositioning": false, + "manuallyResized": false + }, + "trigger_1": { + "x": 30, + "y": 30, + "width": 110, + "height": 80, + "needsResizing": false, + "needsPositioning": false, + "manuallyResized": false + }, + "job_1": { + "x": 30, + "y": 140, + "width": 185, + "height": 225, + "needsResizing": false, + "needsPositioning": false, + "manuallyResized": false + }, + "step_1": { + "x": 30, + "y": 30, + "width": 110, + "height": 80, + "needsResizing": false, + "needsPositioning": false, + "manuallyResized": false + } + } + }, + "": { + "terrator-plugin": { + "aws_s3_bucket": { + "x": 30, + "y": 30, + "width": 110, + "height": 80, + "needsResizing": false, + "needsPositioning": false, + "manuallyResized": false + }, + "aws_s3_bucket_acl": { + "x": 180, + "y": 30, + "width": 110, + "height": 80, + "needsResizing": false, + "needsPositioning": false, + "manuallyResized": false + } + } + }, + ".github/workflows/test CI.yml": { + "githubator-plugin": { + "workflow_1": { + "x": 199, + "y": 259, + "width": 250, + "height": 480, + "needsResizing": false, + "needsPositioning": false, + "manuallyResized": false + }, + "trigger_1": { + "x": 30, + "y": 30, + "width": 110, + "height": 80, + "needsResizing": false, + "needsPositioning": false, + "manuallyResized": false + }, + "job_1": { + "x": 30, + "y": 140, + "width": 185, + "height": 225, + "needsResizing": false, + "needsPositioning": false, + "manuallyResized": false + }, + "step_1": { + "x": 30, + "y": 30, + "width": 110, + "height": 80, + "needsResizing": false, + "needsPositioning": false, + "manuallyResized": false + } + } } } \ No newline at end of file diff --git a/test s3main.tf b/test s3main.tf new file mode 100644 index 0000000..f52a02a --- /dev/null +++ b/test s3main.tf @@ -0,0 +1,10 @@ +resource "aws_s3_bucket" "aws_s3_bucket" { + bucket = "bucket" +} + +resource "aws_s3_bucket_acl" "aws_s3_bucket_acl" { + bucket = [ + aws_s3_bucket.aws_s3_bucket.id, + ] + acl = "private" +}