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

Fixing SmartAlarm worker #346

Merged
merged 3 commits into from Jan 1, 2015
Merged

Fixing SmartAlarm worker #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0c1208
Fixing SmartAlarm worker
Jan 1, 2015
fa8c9f5
Adding some visibility into smart alarm worker
Jan 1, 2015
f29767c
Merging all create dynamodb table commands into one
Jan 1, 2015
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
18 changes: 2 additions & 16 deletions suripu-app/src/main/java/com/hello/suripu/app/SuripuApp.java
View file
Open in desktop
Expand Up @@ -11,14 +11,7 @@
import com.google.common.collect.ImmutableMap;
import com.hello.dropwizard.mikkusu.resources.PingResource;
import com.hello.dropwizard.mikkusu.resources.VersionResource;
import com.hello.suripu.app.cli.CreateAlarmDynamoDBTableCommand;
import com.hello.suripu.app.cli.CreateAlarmInfoDynamoDBTable;
import com.hello.suripu.app.cli.CreateDynamoDBEventTableCommand;
import com.hello.suripu.app.cli.CreateDynamoDBTimeZoneHistoryTableCommand;
import com.hello.suripu.app.cli.CreateFeaturesDynamoDBTableCommand;
import com.hello.suripu.app.cli.CreateRingTimeDynamoDBTable;
import com.hello.suripu.app.cli.CreateSleepScoreDynamoDBTable;
import com.hello.suripu.app.cli.CreateTeamsDynamoDBTableCommand;
import com.hello.suripu.app.cli.CreateDynamoDBTables;
import com.hello.suripu.app.cli.RecreateEventsCommand;
import com.hello.suripu.app.configuration.SuripuAppConfiguration;
import com.hello.suripu.app.modules.RolloutAppModule;
Expand Down Expand Up @@ -113,14 +106,7 @@ public static void main(final String[] args) throws Exception {
public void initialize(final Bootstrap<SuripuAppConfiguration> bootstrap) {
bootstrap.addBundle(new DBIExceptionsBundle());
bootstrap.addCommand(new RecreateEventsCommand());
bootstrap.addCommand(new CreateDynamoDBEventTableCommand());
bootstrap.addCommand(new CreateDynamoDBTimeZoneHistoryTableCommand());
bootstrap.addCommand(new CreateAlarmDynamoDBTableCommand());
bootstrap.addCommand(new CreateRingTimeDynamoDBTable());
bootstrap.addCommand(new CreateAlarmInfoDynamoDBTable());
bootstrap.addCommand(new CreateSleepScoreDynamoDBTable());
bootstrap.addCommand(new CreateFeaturesDynamoDBTableCommand());
bootstrap.addCommand(new CreateTeamsDynamoDBTableCommand());
bootstrap.addCommand(new CreateDynamoDBTables());
bootstrap.addBundle(new KinesisLoggerBundle<SuripuAppConfiguration>() {
@Override
public KinesisLoggerConfiguration getConfiguration(final SuripuAppConfiguration configuration) {
Expand Down
34 changes: 0 additions & 34 deletions suripu-app/src/main/java/com/hello/suripu/app/cli/CreateAlarmDynamoDBTableCommand.java
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions suripu-app/src/main/java/com/hello/suripu/app/cli/CreateAlarmInfoDynamoDBTable.java
View file
Open in desktop

This file was deleted.

151 changes: 151 additions & 0 deletions suripu-app/src/main/java/com/hello/suripu/app/cli/CreateDynamoDBTables.java
View file
Open in desktop
@@ -0,0 +1,151 @@
package com.hello.suripu.app.cli;

import com.amazonaws.AmazonServiceException;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
import com.amazonaws.services.dynamodbv2.model.CreateTableResult;
import com.amazonaws.services.dynamodbv2.model.TableDescription;
import com.hello.suripu.app.configuration.SuripuAppConfiguration;
import com.hello.suripu.core.configuration.DynamoDBConfiguration;
import com.hello.suripu.core.db.AggregateSleepScoreDAODynamoDB;
import com.hello.suripu.core.db.AlarmDAODynamoDB;
import com.hello.suripu.core.db.FeatureStore;
import com.hello.suripu.core.db.MergedAlarmInfoDynamoDB;
import com.hello.suripu.core.db.RingTimeDAODynamoDB;
import com.hello.suripu.core.db.TeamStore;
import com.hello.suripu.core.db.TimeZoneHistoryDAODynamoDB;
import com.yammer.dropwizard.cli.ConfiguredCommand;
import com.yammer.dropwizard.config.Bootstrap;
import net.sourceforge.argparse4j.inf.Namespace;

public class CreateDynamoDBTables extends ConfiguredCommand<SuripuAppConfiguration> {

public CreateDynamoDBTables() {
super("create_dynamodb_tables", "Create dynamoDB tables");
}

@Override
protected void run(Bootstrap<SuripuAppConfiguration> bootstrap, Namespace namespace, SuripuAppConfiguration configuration) throws Exception {
final AWSCredentialsProvider awsCredentialsProvider = new DefaultAWSCredentialsProviderChain();

createAlarmInfoTable(configuration, awsCredentialsProvider);
createAlarmTable(configuration, awsCredentialsProvider);
createFeaturesTable(configuration, awsCredentialsProvider);
createTeamsTable(configuration, awsCredentialsProvider);
createSleepScoreTable(configuration, awsCredentialsProvider);
createRingTimeTable(configuration, awsCredentialsProvider);
createTimeZoneHistoryTable(configuration, awsCredentialsProvider);
}

private void createRingTimeTable(final SuripuAppConfiguration configuration, final AWSCredentialsProvider awsCredentialsProvider) {
DynamoDBConfiguration config = configuration.getRingTimeDBConfiguration();
final AmazonDynamoDBClient client = new AmazonDynamoDBClient(awsCredentialsProvider);
final String tableName = config.getTableName();
client.setEndpoint(config.getEndpoint());
try {
client.describeTable(tableName);
System.out.println(String.format("%s already exists.", tableName));
} catch (AmazonServiceException exception) {
final CreateTableResult result = RingTimeDAODynamoDB.createTable(tableName, client);
final TableDescription description = result.getTableDescription();
System.out.println(description.getTableStatus());
}
}

private void createSleepScoreTable(final SuripuAppConfiguration configuration, final AWSCredentialsProvider awsCredentialsProvider) {
final DynamoDBConfiguration config = configuration.getSleepScoreDBConfiguration();
final AmazonDynamoDBClient client = new AmazonDynamoDBClient(awsCredentialsProvider);
final String version = configuration.getSleepScoreVersion();

client.setEndpoint(config.getEndpoint());
final String tableName = config.getTableName() + "_" + version;
try {
client.describeTable(tableName);
System.out.println(String.format("%s already exists.", tableName));
} catch (AmazonServiceException exception) {
final CreateTableResult result = AggregateSleepScoreDAODynamoDB.createTable(tableName, client);
final TableDescription description = result.getTableDescription();
System.out.println(description.getTableStatus());
}
}

private void createTeamsTable(final SuripuAppConfiguration configuration, final AWSCredentialsProvider awsCredentialsProvider) {

final AmazonDynamoDBClient client = new AmazonDynamoDBClient(awsCredentialsProvider);
client.setEndpoint(configuration.getTeamsDynamoDBConfiguration().getEndpoint());
final String tableName = configuration.getTeamsDynamoDBConfiguration().getTableName();
try {
client.describeTable(tableName);
System.out.println(String.format("%s already exists.", tableName));
} catch (AmazonServiceException exception) {
final CreateTableResult result = TeamStore.createTable(tableName, client);
final TableDescription description = result.getTableDescription();
System.out.println(description.getTableStatus());
}
}

private void createAlarmInfoTable(final SuripuAppConfiguration configuration, final AWSCredentialsProvider awsCredentialsProvider) {

final AmazonDynamoDBClient client = new AmazonDynamoDBClient(awsCredentialsProvider);

client.setEndpoint(configuration.getAlarmInfoDynamoDBConfiguration().getEndpoint());
final String tableName = configuration.getAlarmInfoDynamoDBConfiguration().getTableName();
try {
client.describeTable(tableName);
System.out.println(String.format("%s already exists.", tableName));
} catch (AmazonServiceException exception) {
final CreateTableResult result = MergedAlarmInfoDynamoDB.createTable(tableName, client);
final TableDescription description = result.getTableDescription();
System.out.println(description.getTableStatus());
}
}

private void createFeaturesTable(final SuripuAppConfiguration configuration, final AWSCredentialsProvider awsCredentialsProvider) {

final AmazonDynamoDBClient client = new AmazonDynamoDBClient(awsCredentialsProvider);

client.setEndpoint(configuration.getFeaturesDynamoDBConfiguration().getEndpoint());
final String tableName = configuration.getFeaturesDynamoDBConfiguration().getTableName();
try {
client.describeTable(tableName);
System.out.println(String.format("%s already exists.", tableName));
} catch (AmazonServiceException exception) {
final CreateTableResult result = FeatureStore.createTable(tableName, client);
final TableDescription description = result.getTableDescription();
System.out.println(description.getTableStatus());
}
}

private void createAlarmTable(final SuripuAppConfiguration configuration, final AWSCredentialsProvider awsCredentialsProvider) {

final AmazonDynamoDBClient client = new AmazonDynamoDBClient(awsCredentialsProvider);

client.setEndpoint(configuration.getAlarmDBConfiguration().getEndpoint());
final String tableName = configuration.getAlarmDBConfiguration().getTableName();
try {
client.describeTable(tableName);
System.out.println(String.format("%s already exists.", tableName));
} catch (AmazonServiceException exception) {
final CreateTableResult result = AlarmDAODynamoDB.createTable(tableName, client);
final TableDescription description = result.getTableDescription();
System.out.println(description.getTableStatus());
}
}

private void createTimeZoneHistoryTable(final SuripuAppConfiguration configuration, final AWSCredentialsProvider awsCredentialsProvider) {

final AmazonDynamoDBClient client = new AmazonDynamoDBClient(awsCredentialsProvider);

client.setEndpoint(configuration.getTimeZoneHistoryDBConfiguration().getEndpoint());
final String tableName = configuration.getTimeZoneHistoryDBConfiguration().getTableName();
try {
client.describeTable(tableName);
System.out.println(String.format("%s already exists.", tableName));
} catch (AmazonServiceException exception) {
final CreateTableResult result = TimeZoneHistoryDAODynamoDB.createTable(tableName, client);
final TableDescription description = result.getTableDescription();
System.out.println(description.getTableStatus());
}
}
}
35 changes: 0 additions & 35 deletions ...app/src/main/java/com/hello/suripu/app/cli/CreateDynamoDBTimeZoneHistoryTableCommand.java
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions suripu-app/src/main/java/com/hello/suripu/app/cli/CreateFeaturesDynamoDBTableCommand.java
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions suripu-app/src/main/java/com/hello/suripu/app/cli/CreateRingTimeDynamoDBTable.java
View file
Open in desktop

This file was deleted.