Skip to content

Commit 3c746f4

Browse files
author
Joshua Leaverton
committed
Updated to v1.3.2
1 parent b0d81a6 commit 3c746f4

17 files changed

+1043
-461
lines changed

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
## [1.3.2] - 2020-06-05
7+
- Fix the issue to start instances before the SSM maintenance window beings [#101](https://github.com/awslabs/aws-instance-scheduler/issues/101)
8+
- Updated the SSM feature to reduce lambda cost
9+
- Added HIBERNATE to the list of valid schedule properties
10+
611

712
## [1.3.1] - 2020-03-10
813
### Fixed
914
- Fix the issue for new instances launched outside of the schedule period [#127](https://github.com/awslabs/aws-instance-scheduler/issues/127)
10-
- Fix the issue for instances being stopped after maintenance window begins [#101](https://github.com/awslabs/aws-instance-scheduler/issues/101)
1115
- Fix the issue for retries failures to due incompatible code [#133](https://github.com/awslabs/aws-instance-scheduler/issues/133)
16+
- Fix the issue for instances being stopped after maintenance window begins [#101](https://github.com/awslabs/aws-instance-scheduler/issues/101)
1217

1318
## [1.3.0] - 2019-08-26
1419
### Added
15-
- Upgraded the Solution to Python 3.7
20+
- Upgraded the Solution to Python 3.7

CODE_OF_CONDUCT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Code of Conduct
1+
## Code of Conduct
22
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
33
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
4-
[email protected] with any additional questions or comments.
4+
[email protected] with any additional questions or comments.

CONTRIBUTING.md

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,53 @@
1-
# Contributing Guidelines
1+
# Contributing Guidelines
2+
Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional documentation, we greatly value feedback and contributions from our community.
3+
Please read through this document before submitting any issues or pull requests to ensure we have all the necessary information to effectively respond to your bug report or contribution.
24

3-
Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
4-
documentation, we greatly value feedback and contributions from our community.
5+
## Reporting Bugs/Feature Requests
6+
We welcome you to use the GitHub issue tracker to report bugs or suggest features. When filing an issue, please check [existing open](https://github.com/awslabs/aws-control-tower-customizations/issues), or [recently closed](https://github.com/awslabs/aws-control-tower-customizations/issues?q=is%3Aissue+is%3Aclosed), issues to make sure somebody else hasn't already reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
57

6-
Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
7-
information to effectively respond to your bug report or contribution.
8-
9-
10-
## Reporting Bugs/Feature Requests
11-
12-
We welcome you to use the GitHub issue tracker to report bugs or suggest features.
13-
14-
When filing an issue, please check [existing open](https://github.com/awslabs/iot-device-simulator/issues), or [recently closed](https://github.com/awslabs/iot-device-simulator/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
15-
reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
16-
17-
* A reproducible test case or series of steps
18-
* The version of our code being used
19-
* Any modifications you've made relevant to the bug
20-
* Anything unusual about your environment or deployment
21-
22-
23-
## Contributing via Pull Requests
24-
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
8+
* A reproducible test case or series of steps
9+
* The version of our code being used
10+
* Any modifications you've made relevant to the bug
11+
* Anything unusual about your environment or deployment
2512

13+
## Contributing via Pull Requests
14+
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
2615
1. You are working against the latest source on the *master* branch.
27-
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
16+
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem
17+
already.
2818
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
2919

30-
To send us a pull request, please:
31-
32-
1. Fork the repository.
33-
2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
20+
To send us a pull request, please:
21+
1. Fork the repository.
22+
2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code,
23+
it will be hard for us to focus on your change.
3424
3. Ensure local tests pass.
3525
4. Commit to your fork using clear commit messages.
3626
5. Send us a pull request, answering any default questions in the pull request interface.
37-
6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
27+
6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
3828

3929
GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
40-
[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
30+
[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
4131

4232

43-
## Finding contributions to work on
44-
Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/awslabs/iot-device-simulator/labels/help%20wanted) issues is a great place to start.
33+
## Finding contributions to work on
34+
Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the
35+
default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any
36+
['help wanted'](https://github.com/awslabs/aws-control-tower-customizations/labels/help%20wanted) issues is a great
37+
place to start.
4538

4639

47-
## Code of Conduct
40+
## Code of Conduct
4841
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
4942
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
50-
[email protected] with any additional questions or comments.
51-
43+
[email protected] with any additional questions or comments.
5244

53-
## Security issue notifications
54-
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
5545

46+
## Security issue notifications
47+
If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our
48+
[vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
5649

57-
## Licensing
5850

59-
See the [LICENSE](https://github.com/awslabs/iot-device-simulator/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
51+
## Licensing
52+
See the [LICENSE](https://github.com/awslabs/aws-control-tower-customizations/blob/master/LICENSE.txt) file for our project's licensing. We will ask you to confirm the licensing of your contribution. We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
6053

61-
We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

NOTICE.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWS Instance Scheduler V2
22

3-
Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except
55
in compliance with the License. A copy of the License is located at http://www.apache.org/licenses/
66
or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
@@ -13,4 +13,5 @@ THIRD PARTY COMPONENTS
1313
This software includes third party software subject to the following copyrights:
1414

1515
AWS SDK under the Apache License Version 2.0
16-
pytz under the Massachusetts Institute of Technology (MIT) license
16+
pytz under the Massachusetts Institute of Technology (MIT) license
17+
freezegun under the Apache License Version 2.0

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Scheduler for Cross-Account and Cross-Region scheduling for EC2 and RDS instance
77
## Setup
88

99
Deploys from Cloudformation template generate by makefile
10+
Run the command:`pip3 install -r source/code/requirements.txt -t source/code/` to install the dependencies.
1011
Sample make command: `make bucket=solutions-test-reference solution=aws-instance-scheduler version=1.2.1`
1112

1213

deployment/instance-scheduler-remote.template

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"AWSTemplateFormatVersion": "2010-09-09",
3-
"Description": "(SO0030) - aws-instance-scheduler, version v1.3.1",
3+
"Description": "(SO0030) - aws-instance-scheduler cross account role, version v1.3.2",
44
"Parameters": {
55
"InstanceSchedulerAccount": {
66
"Type": "String",
@@ -11,14 +11,16 @@
1111
},
1212
"Metadata": {
1313
"AWS::CloudFormation::Interface": {
14-
"ParameterGroups": [{
15-
"Label": {
16-
"default": "Account"
17-
},
18-
"Parameters": [
19-
"InstanceSchedulerAccount"
20-
]
21-
}],
14+
"ParameterGroups": [
15+
{
16+
"Label": {
17+
"default": "Account"
18+
},
19+
"Parameters": [
20+
"InstanceSchedulerAccount"
21+
]
22+
}
23+
],
2224
"ParameterLabels": {
2325
"InstanceSchedulerAccount": {
2426
"default": "Primary account"
@@ -42,25 +44,29 @@
4244
"Properties": {
4345
"AssumeRolePolicyDocument": {
4446
"Version": "2012-10-17",
45-
"Statement": [{
46-
"Effect": "Allow",
47-
"Principal": {
48-
"AWS": {
49-
"Fn::Join": [
50-
"", [
51-
"arn:aws:iam::", {
52-
"Ref": "InstanceSchedulerAccount"
53-
},
54-
":root"
47+
"Statement": [
48+
{
49+
"Effect": "Allow",
50+
"Principal": {
51+
"AWS": {
52+
"Fn::Join": [
53+
"",
54+
[
55+
"arn:aws:iam::",
56+
{
57+
"Ref": "InstanceSchedulerAccount"
58+
},
59+
":root"
60+
]
5561
]
56-
]
62+
},
63+
"Service": "lambda.amazonaws.com"
5764
},
58-
"Service": "lambda.amazonaws.com"
59-
},
60-
"Action": [
61-
"sts:AssumeRole"
62-
]
63-
}]
65+
"Action": [
66+
"sts:AssumeRole"
67+
]
68+
}
69+
]
6470
},
6571
"Path": "/",
6672
"Policies": [
@@ -165,10 +171,8 @@
165171
"ec2:DescribeInstances",
166172
"ec2:DescribeRegions",
167173
"ec2:ModifyInstanceAttribute",
168-
169174
"ssm:DescribeMaintenanceWindows",
170175
"ssm:DescribeMaintenanceWindowExecutions",
171-
172176
"tag:GetResources"
173177
],
174178
"Resource": [

0 commit comments

Comments
 (0)