Skip to content

Commit

Permalink
Merge pull request #3 from waterbear-cloud/cookiecutter
Browse files Browse the repository at this point in the history
Merge docs and cli cleanup
  • Loading branch information
kteague committed Jul 6, 2019
2 parents a4d5495 + 6ac816b commit 1463b80
Show file tree
Hide file tree
Showing 81 changed files with 5,002 additions and 519 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ env

# AIM Resources
Resources/
aim_ftest

# Buildout
bin
Expand Down
14 changes: 14 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: 2

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# Optionally build your docs in additional formats such as PDF and ePub
formats: all

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
install:
- requirements: docs/requirements.txt
37 changes: 30 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,47 @@
Changelog for aim
=================

0.6.1 (unreleased)
1.0.0 (unreleased)
------------------

- Document and clean-up AIM CLI.
- Removed deprecated configuration
- Added cmd_init
### Added

- Initial documentation with AIM project site at https://aim.waterbear.cloud/en/latest/

- Added init command with ability to create starting templates for AIM projects
with the cookiecutter project under the hood.

- Added redirect to Listner rules in the ALB

### Changed

- Document and refactor AIM CLI.

- Moved yaml.py to aim.core

- Refactored S3 Controller

- Ported Route53 config to the model

- Ported CodeCommit config to the model

- Refactored S3 to use Application StackGroup

- CPBD artifacts s3 bucket now uses S3 Resource in NetEnv yaml instead

0.6.0.dev0 (2019-06-21)
- Converted the ALB's listener and listener rules to dicts from lists

### Removed

- Removed deprecated configuration


0.6.0 (2019-06-21)
-----------------------

- Document and clean-up AIM CLI.
- Validate and Provision functioning after cleanup.
- Document and clean-up AIM CLI

- Validate and Provision functioning after cleanup


0.5.0 (2019-06-21)
Expand Down
34 changes: 32 additions & 2 deletions docs/_static/css/aim.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
.wy-side-nav-search {
background: #010101 !important;
.wy-nav-content {
background: #ffffff !important;
}

.wy-nav-content {
max-width: 1000px !important;
}

.wy-nav-content p {
font-size: 15px !important;
}

.wy-table-responsive table td,
.wy-table-responsive table th {
white-space: normal !important;
}

.wy-table td,
.rst-content table.docutils td,
.rst-content table.field-list td {
vertical-align: top !important;
}

/* Icons */
.fa-check {
color: green;
font-size: 1.5em;
}

.fa-times {
color: red;
font-size: 1.5em;
}
Binary file added docs/_static/fonts/FontAwesome.otf
Binary file not shown.
Binary file added docs/_static/fonts/fontawesome-webfont.eot
Binary file not shown.
399 changes: 399 additions & 0 deletions docs/_static/fonts/fontawesome-webfont.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file added docs/_static/fonts/fontawesome-webfont.woff
Binary file not shown.
63 changes: 63 additions & 0 deletions docs/_static/templates/AIMInitialization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
AWSTemplateFormatVersion: '2010-09-09'

Description: Creates a local Admin IAM user for AIM

Parameters:

AdminIAMUserName1:
Type: String
Default: 'you@example.com'
Description: IAM user name of the AIM Administrator

Resources:

DelegateIAMRole:
Type: AWS::IAM::Role
DependsOn: AdminIAMUser1
Properties:
RoleName: !Sub 'AIM-Admin-Delegate-Role'
AssumeRolePolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: Allow
Principal:
AWS: !Sub 'arn:aws:iam::${AWS::AccountId}:user/${AdminIAMUserName1}'
Action: sts:AssumeRole
Condition:
Bool:
aws:MultiFactorAuthPresent: true
ManagedPolicyArns:
- 'arn:aws:iam::aws:policy/AdministratorAccess'

AdminIAMUser1:
Type: AWS::IAM::User
Properties:
UserName: !Ref AdminIAMUserName1

AdminIAMUser1Policy:
Type: AWS::IAM::Policy
DependsOn:
- AdminIAMUser1
- DelegateIAMRole
Properties:
PolicyName: 'AIM-Admin-Assume-Role-Policy'
PolicyDocument:
Version: '2012-10-17'
Statement:
- Effect: Allow
Action: sts:AssumeRole
Resource:
- !GetAtt DelegateIAMRole.Arn
Users:
- !Ref AdminIAMUser1

Outputs:

DelegateIAMRoleName:
Value: !Ref DelegateIAMRole

DelegateIAMRoleArn:
Value: !GetAtt DelegateIAMRole.Arn

SigninUrl:
Value: !Sub 'https://signin.aws.amazon.com/switchrole?account=${AWS::AccountId}&roleName=${DelegateIAMRole}'

0 comments on commit 1463b80

Please sign in to comment.