Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make jobflows visible to other IAM users #16

Merged
merged 2 commits into from Nov 13, 2012
Merged

make jobflows visible to other IAM users #16

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e9920b
make jobs visible to all IAM users
tcc-jenkins Nov 13, 2012
c5253f8
make visibletoallusers optional
tcc-jenkins Nov 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.txt
View file
Open in desktop
@@ -1,5 +1,10 @@
CHANGES

1.2.1

- set the VisibleToAllUsers flag on all jobflows
- update to version 1.3.24 of the Amazon SDK for Java

1.2.0

- s3/cp now supports S3 directory to S3 directory copies
Expand Down
2 changes: 1 addition & 1 deletion project.clj
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@

; aws-java-sdk-1.3.3 does not specify the correct httpclient, so we do it explicitly
[org.apache.httpcomponents/httpclient "4.1.1"]
[com.amazonaws/aws-java-sdk "1.3.3"
[com.amazonaws/aws-java-sdk "1.3.24"
:exclusions [javax.mail/mail org.apache.httpcomponents/httpclient]]

; TODO these two are only to support hipchat-- isolate that functionality, so these libs can be optional
Expand Down
1 change: 1 addition & 0 deletions src/main/clj/com/climate/services/aws/emr.clj
View file
Open in desktop
Expand Up @@ -259,6 +259,7 @@
(.setAmiVersion ami-version)
(.setSupportedProducts supported-products)
(.setBootstrapActions bootstrap-actions)
(.setVisibleToAllUsers true)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of hard-coding a value, this should be an optional key, like

(defn start-job-flow [name steps {:keys [log-uri bootstrap-actions ami-version supported-products visible-to-all-users]
:or {bootstrap-actions [] supported-products [] visible-to-all-users false}
...
(.setVisibleToAllUsers visible-to-all-users)

default should be false (compat with std EMR). We can change the default to true for TCC in our local codebase (in lemur_base.clj)

Also change com.lemur.core (around line 568) add this to the map:

:visible-to-all-users (true? (:visible-to-all-users evaluating-opts))

(.setSteps steps))]
(.getJobFlowId (.runJobFlow *emr* request))))

Expand Down