Skip to content

Commit 440c2e4

Browse files
committed
fix: fixed token malformed error
Signed-off-by: NucleoFusion <lakshit.singh.mail@gmail.com>
1 parent 9496bb6 commit 440c2e4

File tree

4 files changed

+67
-28
lines changed

4 files changed

+67
-28
lines changed

.dagger/main.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"context"
55
"fmt"
6+
"os"
67
"regexp"
78
"strings"
89

@@ -22,7 +23,7 @@ type HarborCli struct {
2223
}
2324

2425
// +dagger.function
25-
func (m *HarborCli) Pipeline(ctx context.Context, source *dagger.Directory) (*dagger.Directory, error) {
26+
func (m *HarborCli) Pipeline(ctx context.Context, source *dagger.Directory, githubToken *dagger.Secret) (*dagger.Directory, error) {
2627
err := m.Init(ctx, source)
2728
if err != nil {
2829
return nil, err
@@ -55,14 +56,15 @@ func (m *HarborCli) Pipeline(ctx context.Context, source *dagger.Directory) (*da
5556
return nil, err
5657
}
5758

59+
fmt.Println(os.Getenv("GITHUB_TOKEN"))
5860
// Publishing Release
59-
out, err := pipe.PublishRelease(ctx, dist)
61+
out, err := pipe.PublishRelease(ctx, dist, githubToken)
6062
if err != nil {
6163
return nil, err
6264
}
6365
fmt.Println(out)
6466

65-
return dist, nil
67+
return dist, err
6668
}
6769

6870
func (m *HarborCli) Init(ctx context.Context, source *dagger.Directory) error {

.dagger/pipeline/pipeline.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ type Pipeline struct {
1313

1414
func InitPipeline(source *dagger.Directory, dag *dagger.Client, appVersion string) *Pipeline {
1515
return &Pipeline{
16-
source: source,
17-
dag: dag,
18-
appVersion: appVersion,
19-
GithubToken: dag.Secret("GITHUB_TOKEN"),
16+
source: source,
17+
dag: dag,
18+
appVersion: appVersion,
19+
// GithubToken: dag.Secret("GITHUB_TOKEN"),
20+
// GithubToken: dag.Secret("GITHUB_TOKEN"),
2021
}
2122
}

.dagger/pipeline/release.go

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,58 @@ package pipeline
33
import (
44
"context"
55
"fmt"
6+
"path/filepath"
7+
"strings"
68

79
"dagger/harbor-cli/internal/dagger"
810
)
911

10-
func (s *Pipeline) PublishRelease(ctx context.Context, dist *dagger.Directory) (string, error) {
11-
bins, err := DistBinaries(ctx, dist)
12+
func (s *Pipeline) PublishRelease(ctx context.Context, dist *dagger.Directory, token *dagger.Secret) (string, error) {
13+
bins, err := DistBinaries(ctx, s.dag, dist)
1214
if err != nil {
1315
return "", err
1416
}
1517

16-
cmd := []string{
17-
"gh", "release", "upload", s.appVersion,
18-
}
18+
cmd := []string{"gh", "release", "create", s.appVersion, "--title", fmt.Sprintf("'Release %s'", s.appVersion)}
1919
cmd = append(cmd, bins...)
20-
cmd = append(cmd, "--clobber")
2120

22-
return s.dag.Container().
23-
From("ghcr.io/cli/cli:latest").
21+
ctr := s.dag.Container().
22+
From("debian:bookworm-slim").
23+
WithMountedDirectory("/src", s.source).
2424
WithMountedDirectory("/dist", dist).
25-
WithSecretVariable("GH_TOKEN", s.GithubToken).
26-
WithExec([]string{
27-
"gh", "release", "create", s.appVersion, "--title", fmt.Sprintf("Release %s", s.appVersion),
28-
}).
29-
WithExec([]string{"sh", "-c", "echo $GITHUB_TOKEN"}).
30-
WithExec(cmd).Stderr(ctx)
25+
WithSecretVariable("GH_TOKEN", token).
26+
WithExec([]string{"apt-get", "update"}).
27+
WithExec([]string{"apt-get", "install", "-y", "curl", "git"}).
28+
WithExec([]string{"curl", "-fsSL", "https://cli.github.com/packages/githubcli-archive-keyring.gpg", "-o", "/usr/share/keyrings/githubcli-archive-keyring.gpg"}).
29+
WithExec([]string{"sh", "-c", `echo "deb [arch=amd64 signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list`}).
30+
WithExec([]string{"apt-get", "update"}).
31+
WithExec([]string{"apt-get", "install", "-y", "gh"})
32+
33+
return ctr.
34+
WithWorkdir("/src").
35+
WithExec(cmd).
36+
Stdout(ctx)
3137
}
3238

33-
func DistBinaries(ctx context.Context, dist *dagger.Directory) ([]string, error) {
39+
func DistBinaries(ctx context.Context, s *dagger.Client, dist *dagger.Directory) ([]string, error) {
3440
dirs := []string{"archive", "linux", "windows", "darwin", "deb", "rpm"}
3541
var files []string
3642

37-
for _, d := range dirs {
38-
subdir := dist.Directory(d)
39-
entries, err := subdir.Entries(ctx)
43+
ctr := s.Container().
44+
From("alpine:latest").
45+
WithMountedDirectory("/dist", dist).
46+
WithWorkdir("/dist")
47+
48+
for _, v := range dirs {
49+
out, err := ctr.WithExec([]string{"ls", v}).Stdout(ctx)
4050
if err != nil {
41-
// skip missing directories or return error
42-
continue
51+
return nil, err
4352
}
4453

45-
files = append(files, entries...)
54+
bins := strings.Split(out, "\n")
55+
for _, bin := range bins {
56+
files = append(files, filepath.Join("/", "dist", v, bin))
57+
}
4658
}
4759

4860
return files, nil

test.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
dist/archive/harbor-cli_v1.0.3_darwin_amd64.tar.gz
2+
dist/archive/harbor-cli_v1.0.3_darwin_arm64.tar.gz
3+
dist/archive/harbor-cli_v1.0.3_linux_amd64.tar.gz
4+
dist/archive/harbor-cli_v1.0.3_linux_arm64.tar.gz
5+
dist/archive/harbor-cli_v1.0.3_windows_amd64.zip
6+
dist/archive/harbor-cli_v1.0.3_windows_arm64.zip
7+
dist/archive
8+
dist/linux/harbor-cli_v1.0.3_linux_amd64
9+
dist/linux/harbor-cli_v1.0.3_linux_arm64
10+
dist/linux
11+
dist/windows/harbor-cli_v1.0.3_windows_amd64.exe
12+
dist/windows/harbor-cli_v1.0.3_windows_arm64.exe
13+
dist/windows
14+
dist/darwin/harbor-cli_v1.0.3_darwin_amd64
15+
dist/darwin/harbor-cli_v1.0.3_darwin_arm64
16+
dist/darwin
17+
dist/deb/harbor-cli_v1.0.3_amd64.deb
18+
dist/deb/harbor-cli_v1.0.3_arm64.deb
19+
dist/deb/nfpm.yml
20+
dist/deb
21+
dist/rpm/harbor-cli_v1.0.3_amd64.rpm
22+
dist/rpm/harbor-cli_v1.0.3_arm64.rpm
23+
dist/rpm/nfpm.yml
24+
dist/rpm

0 commit comments

Comments
 (0)