Skip to content

Commit

Permalink
Merge branch 'cloud-custodian:master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
kentnsw authored May 7, 2022
2 parents c886092 + 363f154 commit e596970
Show file tree
Hide file tree
Showing 63 changed files with 1,969 additions and 1,566 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,14 @@ jobs:
run: |
make sphinx
- name: Deploy Docs
if: ${{ github.event_name == 'push' }}
uses: JamesIves/[email protected]
with:
branch: gh-pages
folder: docs/build/html
target-folder: docs

Tests:
runs-on: "${{ matrix.os }}"
needs: Lint
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SELF_MAKE := $(lastword $(MAKEFILE_LIST))
PKG_REPO = testpypi
PKG_SET = tools/c7n_gcp tools/c7n_azure tools/c7n_kube tools/c7n_openstack tools/c7n_mailer tools/c7n_logexporter tools/c7n_policystream tools/c7n_trailcreator tools/c7n_org tools/c7n_sphinxext tools/c7n_terraform tools/c7n_awscc
PKG_SET = tools/c7n_gcp tools/c7n_kube tools/c7n_openstack tools/c7n_mailer tools/c7n_logexporter tools/c7n_policystream tools/c7n_trailcreator tools/c7n_org tools/c7n_sphinxext tools/c7n_terraform tools/c7n_awscc tools/c7n_azure

install:
python3 -m venv .
Expand Down
2 changes: 1 addition & 1 deletion c7n/filters/iamanalyzer.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def get_analyzer(self, client):
if not found:
raise PolicyExecutionError(
"policy:%s no access analyzer found in account or org analyzer specified" % (
self.manager.policy.name
self.manager.ctx.policy.name
))
return found['arn']

Expand Down
2 changes: 1 addition & 1 deletion c7n/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Generated via tools/dev/poetrypkg.py
version = "0.9.15"
version = "0.9.16"
2 changes: 1 addition & 1 deletion docker/cli
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ADD tools/c7n_openstack /src/tools/c7n_openstack
RUN rm -R tools/c7n_openstack/tests

# Install requested providers
ARG providers="azure gcp kube openstack"
ARG providers="gcp kube openstack azure"
RUN . /usr/local/bin/activate && \
for pkg in $providers; do cd tools/c7n_$pkg && \
$HOME/.poetry/bin/poetry install && cd ../../; done
Expand Down
Loading

0 comments on commit e596970

Please sign in to comment.