As we reevaluate how to best support and maintain Staging Ref in the future, we encourage development teams using this environment to highlight their use cases in the following issue: https://gitlab.com/gitlab-com/gl-infra/software-delivery/framework/software-delivery-framework-issue-tracker/-/issues/36.

Skip to content
Snippets Groups Projects
Unverified Commit a8f50019 authored by Ash McKenzie's avatar Ash McKenzie
Browse files

Minor formatting / lint fixes

parent d4490feb
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -61,6 +61,7 @@ func NewGitlabBackend(ctx context.Context, config *config.Config, args *commanda
if err != nil {
return nil, err
}
return &GitlabBackend{
ctx,
config,
Loading
Loading
@@ -79,8 +80,8 @@ func (b *GitlabBackend) issueBatchArgs(op string, oid string, href string, heade
}
args = transfer.Args{
"id":"",
"token":"",
"id": "",
"token": "",
}
dataBinary, err := json.Marshal(data)
if err != nil {
Loading
Loading
Loading
Loading
@@ -41,11 +41,13 @@ var (
func setupWaitGroup(t *testing.T, cmd *Command) *sync.WaitGroup {
wg := &sync.WaitGroup{}
wg.Add(1)
go func() {
_, err := cmd.Execute(context.Background())
require.NoError(t, err)
wg.Done()
}()
return wg
}
Loading
Loading
@@ -76,10 +78,12 @@ func writeCommandArgsAndBinaryData(t *testing.T, pl *pktline.Pktline, command st
func writeCommandArgsAndTextData(t *testing.T, pl *pktline.Pktline, command string, args []string, data []string) {
require.NoError(t, pl.WritePacketText(command))
for _, arg := range args {
require.NoError(t, pl.WritePacketText(arg))
}
require.NoError(t, pl.WriteDelim())
for _, datum := range data {
require.NoError(t, pl.WritePacketText(datum))
}
Loading
Loading
@@ -306,6 +310,7 @@ func TestLfsTransferBatchDownload(t *testing.T) {
require.True(t, found)
idBinary, err := base64.StdEncoding.DecodeString(idBase64)
require.NoError(t, err)
var id map[string]interface{}
require.NoError(t, json.Unmarshal(idBinary, &id))
require.Equal(t, map[string]interface{}{
Loading
Loading
@@ -322,6 +327,7 @@ func TestLfsTransferBatchDownload(t *testing.T) {
h.Write(idBinary)
tokenBase64, found := strings.CutPrefix(tokenArg, "token=")
require.True(t, found)
tokenBinary, err := base64.StdEncoding.DecodeString(tokenBase64)
require.NoError(t, err)
require.Equal(t, h.Sum(nil), tokenBinary)
Loading
Loading
Loading
Loading
@@ -90,7 +90,7 @@ func (c *Client) Batch(operation string, reqObjects []*BatchObject, ref string,
return nil, err
}
defer res.Body.Close()
defer func() { _ = res.Body.Close() }()
response := &BatchResponse{}
if err := gitlabnet.ParseJSON(res, response); err != nil {
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment