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

Fixes bug #76 Correct implementation of createAnnotatedTag(). #77

Merged
merged 2 commits into from
Jan 2, 2024
Merged

Fixes bug #76 Correct implementation of createAnnotatedTag(). #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f12ed97
Fixes bug #76 Correct implementation of createAnnotatedTag().
Sep 17, 2021
293e2a5
Merge branch 'spotify:master' into master
solarhess Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/main/java/com/spotify/github/v3/clients/GitDataClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,10 @@ public CompletableFuture<Tag> createAnnotatedTag(
"name", taggerName,
"email", taggerEmail,
"date", Instant.now().toString()));
return createTagReference(tag, sha)
.thenCompose(
reference -> github.post(tagPath, github.json().toJsonUnchecked(body), Tag.class));
return github.post(tagPath, github.json().toJsonUnchecked(body), Tag.class)
.thenCompose(tagCreated ->
createTagReference(tag, tagCreated.sha())
.thenApply(reference -> tagCreated));
}

/**
Expand Down
28 changes: 15 additions & 13 deletions src/test/java/com/spotify/github/v3/clients/GitDataClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,19 +182,6 @@ public void createTagReference() throws Exception {

@Test
public void createAnnotateTag() throws Exception {
final CompletableFuture<Reference> reference =
completedFuture(json.fromJson(getFixture("tag.json"), Reference.class));
when(github.post(
"/repos/someowner/somerepo/git/refs",
github
.json()
.toJsonUnchecked(
of(
"ref", "refs/tags/0.0.1",
"sha", "5926dd300de5fee31d445c57be223f00e128a634")),
Reference.class))
.thenReturn(reference);

final String now = Instant.now().toString();
final ImmutableMap<String, Object> body =
of(
Expand All @@ -211,6 +198,21 @@ public void createAnnotateTag() throws Exception {
completedFuture(json.fromJson(getFixture("release-tag.json"), Tag.class));
when(github.post(eq("/repos/someowner/somerepo/git/tags"), any(), eq(Tag.class)))
.thenReturn(fixture);

// Ref to the annotate tag should reference the SHA of the tag, not the SHA of the commit.
final CompletableFuture<Reference> reference =
completedFuture(json.fromJson(getFixture("tag.json"), Reference.class));
when(github.post(
"/repos/someowner/somerepo/git/refs",
github
.json()
.toJsonUnchecked(
of(
"ref", "refs/tags/0.0.1",
"sha", "827210625b551200e7d3dc608935b1454523eaa8")),
Reference.class))
.thenReturn(reference);

Tag tag =
gitDataClient
.createAnnotatedTag(
Expand Down
Loading