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

Feature/merge velvet #1197

Merged
merged 6 commits into from
Jul 23, 2015
Merged

Feature/merge velvet #1197

merged 6 commits into from
Jul 23, 2015

Conversation

kuenishi
Copy link
Contributor

For #1190 (RCS-201) .

kuenishi added 2 commits July 22, 2015 14:20
@kuenishi
Introduce Stanchion access code - since 439cd80
c68311a
@kuenishi
Refactor velvet code
e0c23fb 
Velvet have been including many duplicate code. There are still
many duplicates, but so far this will be kept as it is.
@kuenishi kuenishi mentioned this pull request Jul 22, 2015
Merged
@kuenishi kuenishi added this to the 2.1.0 milestone Jul 22, 2015
shino
shino reviewed Jul 22, 2015
View reviewed changes
src/riak_cs_acl_utils.erl
%% @doc Construct an acl. The structure is the same for buckets
%% and objects.
-spec acl(string(), string(), string(), [acl_grant()], erlang:timestamp()) -> acl().
acl(DisplayName, CanonicalId, KeyId, Grants, CreationTime) ->
Copy link
Contributor

Choose a reason for hiding this comment

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

This function is not used?

Copy link
Contributor

Choose a reason for hiding this comment

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

Oops. Used from test code. hmm...

Copy link
Contributor

Choose a reason for hiding this comment

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

That test code tests acl_from_json, but the function is not used 🚫

@shino
Copy link
Contributor

shino commented Jul 22, 2015

One test fails:

================ buckets_test failure stack trace =====================
{undef,[{stanchion_utils,md5,["riak-test-bucket"],[]},
        {rc_helper,to_riak_bucket,2,
                   [{file,"riak_test/src/rc_helper.erl"},{line,27}]},
        {rc_helper,get_riakc_obj,4,
                   [{file,"riak_test/src/rc_helper.erl"},{line,53}]},
        {buckets_test,prepare_bucket_with_orphan_mp,4,
                      [{file,"riak_test/tests/buckets_test.erl"},{line,193}]},
        {buckets_test,verify_bucket_mpcleanup_racecond_and_fix,4,
                      [{file,"riak_test/tests/buckets_test.erl"},{line,126}]},
        {buckets_test,confirm,0,
                      [{file,"riak_test/tests/buckets_test.erl"},{line,57}]},
        {riak_test_runner,return_to_exit,3,
                          [{file,"src/riak_test_runner.erl"},{line,159}]}]}
=======================================================================

@kuenishi
Copy link
Contributor Author

Updated

@kuenishi kuenishi mentioned this pull request Jul 23, 2015
Closed
@shino
Copy link
Contributor

shino commented Jul 23, 2015

As commented at basho/stanchion#99, velvet:list_buckets/* are not used from riak cs. Do you include removal of such unused code in this PR? If so, I will wait for a while.

@kuenishi
Copy link
Contributor Author

Removed more codes than told, as Emacs flymake told me more.

@kuenishi kuenishi force-pushed the feature/merge-velvet branch from 5695ddd to 10d1be5 Compare July 23, 2015 05:51
@shino
Copy link
Contributor

shino commented Jul 23, 2015

Compilation failed for r_t

riak_test/src/rtcs.erl:1027: crypto:sha_mac/2 is deprecated and will be removed in in a future release; use crypto:hmac/3
riak_test/src/rtcs.erl:1028: crypto:sha/1 is deprecated and will be removed in in a future release; use crypto:hash/2
riak_test/src/rtcs.erl:1029: crypto:md5/1 is deprecated and will be removed in in a future release; use crypto:hash/2
ERROR: riak_test_compile failed while processing /home/shino/b/g/riak_cs-2.1: rebar_abort

@kuenishi
Copy link
Contributor Author

Updated

@shino
Copy link
Contributor

shino commented Jul 23, 2015

riak_test passed! Great cleanup 💯

borshop added a commit that referenced this pull request Jul 23, 2015
@borshop
Merge pull request #1197 from basho/feature/merge-velvet
402314e 
Feature/merge velvet

Reviewed-by: shino
@shino
Copy link
Contributor

shino commented Jul 23, 2015

@borshop merge

@borshop borshop merged commit 6a435b1 into develop Jul 23, 2015
@kuenishi kuenishi deleted the feature/merge-velvet branch July 23, 2015 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.1.0
Development

Successfully merging this pull request may close these issues.
3 participants
@kuenishi @shino @borshop