Skip to content

Commit

Permalink
Add pre-commit and fix all trailing ws and end-of-file
Browse files Browse the repository at this point in the history
  • Loading branch information
dividehex committed Jul 13, 2023
1 parent 9f7093f commit e7f1f21
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/google-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
uses: 'google-github-actions/upload-cloud-storage@v1'
with:
path: './'
destination: '${{ env.BUCKET_NAME }}'
destination: '${{ env.BUCKET_NAME }}'
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
call-deploy-configuration-to-dev:
name: Deploy to Development
if: github.event_name == 'push' && github.ref_name == 'master'
needs: call-test-configuration
needs: call-test-configuration
uses: ./.github/workflows/google-deploy.yaml
with:
environment: development
Expand Down
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Community Participation Guidelines

This repository is governed by Mozilla's code of conduct and etiquette guidelines.
This repository is governed by Mozilla's code of conduct and etiquette guidelines.
For more details, please read the
[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/).
[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/).

## How to Report
For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ test:

.PHONY: deploy
deploy: test
aws s3 sync . s3://$(S3_BUCKET) --acl public-read
aws s3 sync . s3://$(S3_BUCKET) --acl public-read
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ This is a list of available fields.
vanity_url: ['/an-easy-to-remember-url']
### Security settings
# The list of users and groups allowed to access this RP.
# The list of users and groups allowed to access this RP.
# If both authorize_users and authorized_groups are empty, everyone is allowed
# If one is empty and the other has content, only the members of the non empty one are allowed
# If both have content, the union of everyone in both are allowed
Expand Down Expand Up @@ -75,14 +75,14 @@ In order to publish a change you must:

1. Clone the repository
2. Pull request to `master` and get it approved.
3. Have the PR merged to the `master` branch which will cause CI to deploy to
the *dev* S3 bucket called `sso-dashboard.configuration` which can then be
3. Have the PR merged to the `master` branch which will cause CI to deploy to
the *dev* S3 bucket called `sso-dashboard.configuration` which can then be
seen at https://sso.allizom.org/dashboard and is used by the Auth0 dev tenant
rules from https://cdn.sso.allizom.org/apps.yml
4. Tag the commit in `master` that should be deployed to *production* with a
4. Tag the commit in `master` that should be deployed to *production* with a
conforming tag name. A conforming tag name for a production deploy is in the
format of [1.2.3-prod](https://github.com/mozilla-iam/sso-dashboard-configuration/blob/26f1e5c7d8512b1a447dbac0e981fa3afbf3c346/deploy.sh#L11).
Applying this tag will cause CI to deploy to the
Applying this tag will cause CI to deploy to the
`sso-dashboard.configuration-prod` S3 bucket used by production. The easiest
way to tag and trigger a production deployment is to [create a 'release'](https://github.com/mozilla-iam/sso-dashboard-configuration/releases),
we are using semantic versioning (0.0.1) for this repo.
Expand Down
5 changes: 2 additions & 3 deletions apps.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Data Classification : Public
# The contents of this file are meant to be publicly accessible and this file contains no private data
#
#
# NOTE: authorized_groups and authorized_users control two things independently:
#
# 1. Does the SSO Dashboard display a tile to the user for this application?
Expand Down Expand Up @@ -4052,7 +4052,7 @@ apps:
op: auth0
url: https://auth.mozilla.auth0.com/samlp/NdaW4gufg0LfVCXCiOXqbV9mn6nou0Qp
- application:
authorized_groups:
authorized_groups:
- mozilliansorg_notion-access
authorized_users: []
client_id: VezzSFjr5YxbFicOqhLmnL8UfUGALQtl
Expand Down Expand Up @@ -4110,4 +4110,3 @@ apps:
name: Dualo
op: auth0
url: https://auth.mozilla.auth0.com/samlp/lREe0wwQvrFGwjIaSfrYLBuwAUUF8BOt

2 changes: 1 addition & 1 deletion tools/client_id_checker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

apps["apps"].each do |app|
begin

client_id = app["application"]["client_id"]
unless client_id.nil?
client_ids.append(client_id)
Expand Down

0 comments on commit e7f1f21

Please sign in to comment.