Skip to content
This repository has been archived by the owner on Oct 20, 2020. It is now read-only.

Commit

Permalink
Merge pull request #4 from MiniclipPortugal/feature/OTP19_spec_fix
Browse files Browse the repository at this point in the history 
-spec syntax fix for Erlang/OTP 19.0
  • Loading branch information
@lrascao
lrascao authored May 16, 2017
2 parents 35dfe21 + 36d14b3 commit 988528d
Show file tree
Hide file tree
Showing 16 changed files with 596 additions and 590 deletions.
36 changes: 18 additions & 18 deletions src/erlcloud_cloudtrail.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@
%%
%% API
%%
-spec(create_trail/3 :: (string(), string(), aws_config()) -> ct_return()).
-spec create_trail(string(), string(), aws_config()) -> ct_return().
create_trail(Trail, S3BucketName, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)},
{<<"S3BucketName">>, list_to_binary(S3BucketName)}
],
ct_request("CreateTrail", Json, Config).

-spec(create_trail/4 :: (string(), string(), string(), aws_config()) -> ct_return()).
-spec create_trail(string(), string(), string(), aws_config()) -> ct_return().
create_trail(Trail, S3BucketName, SnsTopicName, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)},
{<<"S3BucketName">>, list_to_binary(S3BucketName)},
{<<"SnsTopicName">>, list_to_binary(SnsTopicName)}
],
ct_request("CreateTrail", Json, Config).

-spec(create_trail/5 :: (string(), string(), string(), boolean(), aws_config()) -> ct_return()).
-spec create_trail(string(), string(), string(), boolean(), aws_config()) -> ct_return().
create_trail(Trail, S3BucketName, SnsTopicName, IncludeGlobalServiceEvents, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)},
{<<"S3BucketName">>, list_to_binary(S3BucketName)},
Expand All @@ -51,7 +51,7 @@ create_trail(Trail, S3BucketName, SnsTopicName, IncludeGlobalServiceEvents, Conf
],
ct_request("CreateTrail", Json, Config).

-spec(create_trail/6 :: (string(), string(), string(), string(), boolean(), aws_config()) -> ct_return()).
-spec create_trail(string(), string(), string(), string(), boolean(), aws_config()) -> ct_return().
create_trail(Trail, S3BucketName, S3KeyPrefix, SnsTopicName, IncludeGlobalServiceEvents, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)},
{<<"S3BucketName">>, list_to_binary(S3BucketName)},
Expand All @@ -61,19 +61,19 @@ create_trail(Trail, S3BucketName, S3KeyPrefix, SnsTopicName, IncludeGlobalServic
],
ct_request("CreateTrail", Json, Config).

-spec(delete_trail/1 :: ([string()] ) -> ct_return()).
-spec delete_trail([string()]) -> ct_return().
delete_trail(Trail) ->
delete_trail(Trail, default_config()).

-spec(delete_trail/2 :: ([string()], aws_config()) -> ct_return()).
-spec delete_trail([string()], aws_config()) -> ct_return().
delete_trail(Trail, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)}],
ct_request("DeleteTrail", Json, Config).

-spec(describe_trails/0 :: () -> ct_return()).
-spec describe_trails() -> ct_return().
describe_trails() -> describe_trails([]).

-spec(describe_trails/1 :: ([string()] | aws_config()) -> ct_return()).
-spec describe_trails([string()] | aws_config()) -> ct_return().
describe_trails(Config) when is_record(Config, aws_config) ->
describe_trails([], Config);

Expand All @@ -82,7 +82,7 @@ describe_trails(Config) when is_record(Config, aws_config) ->
describe_trails(Trails) ->
describe_trails(Trails, default_config()).

-spec(describe_trails/2 :: ([string()], aws_config()) -> ct_return()).
-spec describe_trails([string()], aws_config()) -> ct_return().
describe_trails([], Config) ->
ct_request("DescribeTrails", [], Config);

Expand All @@ -91,42 +91,42 @@ describe_trails(Trails, Config) ->
Json = [{<<"TrailNameList">>, [list_to_binary(T) || T <- Trails]}],
ct_request("DescribeTrails", Json, Config).

-spec(get_trail_status/1 :: ([string()] ) -> ct_return()).
-spec get_trail_status([string()] ) -> ct_return().
get_trail_status(Trail) ->
get_trail_status(Trail, default_config()).

-spec(get_trail_status/2 :: ([string()], aws_config()) -> ct_return()).
-spec get_trail_status([string()], aws_config()) -> ct_return().
get_trail_status(Trail, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)}],
ct_request("GetTrailStatus", Json, Config).

-spec(start_logging/1 :: ([string()] ) -> ct_return()).
-spec start_logging([string()] ) -> ct_return().
start_logging(Trail) ->
start_logging(Trail, default_config()).

-spec(start_logging/2 :: ([string()], aws_config()) -> ct_return()).
-spec start_logging([string()], aws_config()) -> ct_return().
start_logging(Trail, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)}],
ct_request("StartLogging", Json, Config).

-spec(stop_logging/1 :: ([string()] ) -> ct_return()).
-spec stop_logging([string()] ) -> ct_return().
stop_logging(Trail) ->
stop_logging(Trail, default_config()).

-spec(stop_logging/2 :: ([string()], aws_config()) -> ct_return()).
-spec stop_logging([string()], aws_config()) -> ct_return().
stop_logging(Trail, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)}],
ct_request("StopLogging", Json, Config).

-spec(update_trail/4 :: (string(), string(), string(), aws_config()) -> ct_return()).
-spec update_trail(string(), string(), string(), aws_config()) -> ct_return().
update_trail(Trail, S3BucketName, SnsTopicName, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)},
{<<"S3BucketName">>, list_to_binary(S3BucketName)},
{<<"SnsTopicName">>, list_to_binary(SnsTopicName)}
],
ct_request("UpdateTrail", Json, Config).

-spec(update_trail/5 :: (string(), string(), string(), boolean(), aws_config()) -> ct_return()).
-spec update_trail(string(), string(), string(), boolean(), aws_config()) -> ct_return().
update_trail(Trail, S3BucketName, SnsTopicName, IncludeGlobalServiceEvents, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)},
{<<"S3BucketName">>, list_to_binary(S3BucketName)},
Expand All @@ -136,7 +136,7 @@ update_trail(Trail, S3BucketName, SnsTopicName, IncludeGlobalServiceEvents, Conf
ct_request("UpdateTrail", Json, Config).


-spec(update_trail/6 :: (string(), string(), string(), string(), boolean(), aws_config()) -> ct_return()).
-spec update_trail(string(), string(), string(), string(), boolean(), aws_config()) -> ct_return().
update_trail(Trail, S3BucketName, S3KeyPrefix, SnsTopicName, IncludeGlobalServiceEvents, Config) ->
Json = [{<<"Name">>, list_to_binary(Trail)},
{<<"S3BucketName">>, list_to_binary(S3BucketName)},
Expand Down
8 changes: 4 additions & 4 deletions src/erlcloud_ddb.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,23 +176,23 @@
%%% Library initialization.
%%%------------------------------------------------------------------------------

-spec(new/2 :: (string(), string()) -> aws_config()).
-spec new(string(), string()) -> aws_config().
new(AccessKeyID, SecretAccessKey) ->
#aws_config{access_key_id=AccessKeyID,
secret_access_key=SecretAccessKey}.

-spec(new/3 :: (string(), string(), string()) -> aws_config()).
-spec new(string(), string(), string()) -> aws_config().
new(AccessKeyID, SecretAccessKey, Host) ->
#aws_config{access_key_id=AccessKeyID,
secret_access_key=SecretAccessKey,
ddb_host=Host}.

-spec(configure/2 :: (string(), string()) -> ok).
-spec configure(string(), string()) -> ok.
configure(AccessKeyID, SecretAccessKey) ->
put(aws_config, new(AccessKeyID, SecretAccessKey)),
ok.

-spec(configure/3 :: (string(), string(), string()) -> ok).
-spec configure(string(), string(), string()) -> ok.
configure(AccessKeyID, SecretAccessKey, Host) ->
put(aws_config, new(AccessKeyID, SecretAccessKey, Host)),
ok.
Expand Down
8 changes: 4 additions & 4 deletions src/erlcloud_ddb2.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,23 +200,23 @@
%%% Library initialization.
%%%------------------------------------------------------------------------------

-spec(new/2 :: (string(), string()) -> aws_config()).
-spec new(string(), string()) -> aws_config().
new(AccessKeyID, SecretAccessKey) ->
#aws_config{access_key_id=AccessKeyID,
secret_access_key=SecretAccessKey}.

-spec(new/3 :: (string(), string(), string()) -> aws_config()).
-spec new(string(), string(), string()) -> aws_config().
new(AccessKeyID, SecretAccessKey, Host) ->
#aws_config{access_key_id=AccessKeyID,
secret_access_key=SecretAccessKey,
ddb_host=Host}.

-spec(configure/2 :: (string(), string()) -> ok).
-spec configure(string(), string()) -> ok.
configure(AccessKeyID, SecretAccessKey) ->
put(aws_config, new(AccessKeyID, SecretAccessKey)),
ok.

-spec(configure/3 :: (string(), string(), string()) -> ok).
-spec configure(string(), string(), string()) -> ok.
configure(AccessKeyID, SecretAccessKey, Host) ->
put(aws_config, new(AccessKeyID, SecretAccessKey, Host)),
ok.
Expand Down
8 changes: 4 additions & 4 deletions src/erlcloud_ddb_streams.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,25 +90,25 @@
%%% Library initialization.
%%%------------------------------------------------------------------------------

-spec(new/2 :: (string(), string()) -> aws_config()).
-spec new(string(), string()) -> aws_config().
new(AccessKeyID, SecretAccessKey) ->
#aws_config{access_key_id=AccessKeyID,
secret_access_key=SecretAccessKey,
retry = fun erlcloud_retry:default_retry/1}.

-spec(new/3 :: (string(), string(), string()) -> aws_config()).
-spec new(string(), string(), string()) -> aws_config().
new(AccessKeyID, SecretAccessKey, Host) ->
#aws_config{access_key_id=AccessKeyID,
secret_access_key=SecretAccessKey,
ddb_streams_host=Host,
retry = fun erlcloud_retry:default_retry/1}.

-spec(configure/2 :: (string(), string()) -> ok).
-spec configure(string(), string()) -> ok.
configure(AccessKeyID, SecretAccessKey) ->
put(aws_config, new(AccessKeyID, SecretAccessKey)),
ok.

-spec(configure/3 :: (string(), string(), string()) -> ok).
-spec configure(string(), string(), string()) -> ok.
configure(AccessKeyID, SecretAccessKey, Host) ->
put(aws_config, new(AccessKeyID, SecretAccessKey, Host)),
ok.
Expand Down
Loading

0 comments on commit 988528d

Please sign in to comment.