Merge pull request #82 from Clever/update-status-with-remote

Update status with remote.. follow-up nits

.gitignore

@@ -11,3 +11,6 @@ release/
 # microplane init creates files in the mp/ dir
 # let's ignore this so we don't accidentally commit debug runs to the mp repo
 mp/
+
+# text editor files
+./vscode

CHANGELOG.md

@@ -1,5 +1,9 @@
 # changelog
 
+2021-05-14 - v0.0.30
+
+- Fixes - `mp sync` bug in Gitlab, due to ID vs IID
+
 2021-05-14 - v0.0.29
 
 - Adds - Command `mp sync` to sync local status with remote status [#81](https://github.com/Clever/microplane/pull/81)

VERSION

@@ -1 +1 @@
-0.0.29
+0.0.30

integration_test.sh

@@ -52,17 +52,29 @@ echo "$owner/2" >> $tmpfile
 ./bin/mp init --provider $provider -f $tmpfile
 rm $tmpfile
 
+echo ""
 echo "[Clone]"
 ./bin/mp clone
 ts=`date +"%T"`
 
+./bin/mp status
+./bin/mp sync
 
+echo ""
 echo "[Plan]"
 ./bin/mp plan -b plan -m "plan" -- sh -c "echo $ts >> README.md"
 
+./bin/mp status
+./bin/mp sync
+
+echo ""
 echo "[Push]"
 ./bin/mp push --throttle 2s -a nathanleiby
 
+./bin/mp status
+./bin/mp sync
+
+echo ""
 echo "[Merge]"
 cmd='./bin/mp merge --throttle 2s --ignore-build-status --ignore-review-approval'
 duration=10
@@ -71,3 +83,6 @@ until $cmd; do
     sleep $duration
 done
 
+echo ""
+./bin/mp status
+./bin/mp sync

push/pushGitlab.go

@@ -79,7 +79,7 @@ func GitlabPush(ctx context.Context, input Input, repoLimiter *time.Ticker, push
 	return Output{
 		Success:                   true,
 		CommitSHA:                 pr.SHA,
-		PullRequestNumber:         pr.ID,
+		PullRequestNumber:         pr.IID,
 		PullRequestURL:            pr.WebURL,
 		PullRequestCombinedStatus: pipelineStatus,
 		PullRequestAssignee:       input.PRAssignee,