Get GiddyUp product and version from the default version instead of config

Author: Brett Hazen

src/giddyup.erl

@@ -27,6 +27,7 @@
 get_suite(Platform) ->
     Schema = get_schema(Platform),
     Name = kvc:path('project.name', Schema),
+    Version = rt_config:get_default_version_number(),
     lager:info("Retrieved Project: ~s", [Name]),
     Tests = kvc:path('project.tests', Schema),
     TestProps  =
@@ -39,7 +40,7 @@ get_suite(Platform) ->
                      X -> binary_to_atom(X, utf8)
                  end},
                 {platform, list_to_binary(Platform)},
-                {version, rt:get_version()},
+                {version, Version},
                 {project, Name}
             ] ++
             case kvc:path('tags.upgrade_version', Test) of
@@ -58,8 +59,8 @@ get_schema(Platform) ->
 
 get_schema(Platform, Retries) ->
     Host = rt_config:get(giddyup_host),
-    Project = rt_config:get(giddyup_project),
-    Version = rt:get_version(),
+    Project = rt_config:get_default_version_product(),
+    Version = rt_config:get_default_version_number(),
     URL = lists:flatten(io_lib:format("http://~s/projects/~s?platform=~s&version=~s", [Host, Project, Platform, Version])),
     lager:info("giddyup url: ~s", [URL]),
 

src/rt_config.erl

@@ -27,6 +27,8 @@
          config_or_os_env/2,
          convert_to_string/1,
          get_default_version/0,
+         get_default_version_product/0,
+         get_default_version_number/0,
          get_previous_version/0,
          get_legacy_version/0,
          get_os_env/1,
@@ -45,7 +47,6 @@
 -define(CONFIG_NAMESPACE, riak_test).
 -define(RECEIVE_WAIT_TIME_KEY, rt_max_receive_wait_time).
 -define(GIDDYUP_PLATFORM_KEY, giddyup_platform).
--define(GIDDYUP_PROJECT_KEY, giddyup_project).
 -define(VERSION_KEY, versions).
 -define(DEFAULT_VERSION_KEY, default).
 -define(PREVIOUS_VERSION_KEY, previous).
@@ -116,9 +117,6 @@ get(rt_max_wait_time) ->
 get(platform) ->
     lager:info("platform is deprecated. Please use giddyup_platform instead."),
     rt_config:get(?GIDDYUP_PLATFORM_KEY);
-get(rt_project) ->
-    lager:info("rt_project is deprecated. Please use giddyup_project instead."),
-    rt_config:get(?GIDDYUP_PROJECT_KEY);
 get(?CONTINUE_ON_FAIL_KEY) ->
     get(?CONTINUE_ON_FAIL_KEY, ?DEFAULT_CONTINUE_ON_FAIL);
 get(Key) ->
@@ -144,6 +142,18 @@ get(Key, Default) ->
 get_default_version() ->
     get_version(?DEFAULT_VERSION_KEY).
 
+%% @doc Return the default product from the version
+-spec get_default_version_product() -> string().
+get_default_version_product() ->
+    DefaultVersion = get_version(?DEFAULT_VERSION_KEY),
+    string:sub_word(DefaultVersion, 1, $-).
+
+%% @doc Return the default version number
+-spec get_default_version_number() -> string().
+get_default_version_number() ->
+    DefaultVersion = get_version(?DEFAULT_VERSION_KEY),
+    string:sub_word(DefaultVersion, 2, $-).
+
 %% @doc Return the default version
 -spec get_previous_version() -> string().
 get_previous_version() ->

src/rt_planner.erl

@@ -46,11 +46,11 @@
 
 %% gen_server callbacks
 -export([init/1,
-    handle_call/3,
-    handle_cast/2,
-    handle_info/2,
-    terminate/2,
-    code_change/3]).
+         handle_call/3,
+         handle_cast/2,
+         handle_info/2,
+         terminate/2,
+         code_change/3]).
 
 -define(SERVER, ?MODULE).