update

.github/CODEOWNERS

@@ -1 +1 @@
-* @gitpod-io/team-engine
+* @khulnasoft/team-engine

.goreleaser.yml

@@ -6,7 +6,7 @@ builds:
   env:
   - CGO_ENABLED=0
   ldflags:
-  - -s -w -X github.com/gitpod-io/dazzle/cmd/core.version={{.Version}}-{{.ShortCommit}}
+  - -s -w -X github.com/khulnasoft/dazzle/cmd/core.version={{.Version}}-{{.ShortCommit}}
   goos:
   - darwin
   - linux
@@ -18,7 +18,7 @@ builds:
   flags:
     - -tags=util
   ldflags:
-  - -s -w -X github.com/gitpod-io/dazzle/cmd/util.version={{.Version}}-{{.ShortCommit}}
+  - -s -w -X github.com/khulnasoft/dazzle/cmd/util.version={{.Version}}-{{.ShortCommit}}
   goos:
   - darwin
   - linux
@@ -60,6 +60,6 @@ dockers:
     goarm: ''
     dockerfile: Dockerfile
     image_templates:
-    - "ghcr.io/gitpod-io/dazzle:{{ .Tag }}"
+    - "ghcr.io/khulnasoft/dazzle:{{ .Tag }}"
     extra_files:
     - README.md

.gitpod.Dockerfile → .khulnasoft.Dockerfile

@@ -1,4 +1,4 @@
-FROM gitpod/workspace-full
+FROM khulnasoft/workspace-full
 
 USER root
 ENV TRIGGER_REBUILD=2
@@ -8,4 +8,4 @@ RUN sudo su -c "cd /usr; curl -L https://github.com/moby/buildkit/releases/downl
 # NOTE: remove when workspace-full includes golangci
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo BINDIR=/usr/local/bin sh
 
-USER gitpod
+USER khulnasoft

.gitpod.yml → .khulnasoft.yml

@@ -1,10 +1,10 @@
 image:
-  file: .gitpod.Dockerfile
+  file: .khulnasoft.Dockerfile
 
 checkoutLocation: dazzle
 workspaceLocation: dazzle
 tasks:
-  - command: sudo buildkitd --group gitpod
+  - command: sudo buildkitd --group khulnasoft
   - command: docker run -p 5000:5000 --name registry --rm registry:2
     openMode: split-right
   - init: go get -v ./...

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2019 Gitpod
+Copyright © 2019 Khulnasoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,12 +1,12 @@
 <img src="logo.png" width="100" style="padding: 1em; background-color: white; border-radius: 10px;">
 
-[![Setup Automated](https://img.shields.io/badge/setup-automated-blue?logo=gitpod)](https://gitpod.io/#https://github.com/gitpod-io/dazzle)
-[![Go Report Card](https://goreportcard.com/badge/github.com/gitpod-io/dazzle)](https://goreportcard.com/report/github.com/gitpod-io/dazzle)
+[![Setup Automated](https://img.shields.io/badge/setup-automated-blue?logo=khulnasoft)](https://khulnasoft.io/#https://github.com/khulnasoft/dazzle)
+[![Go Report Card](https://goreportcard.com/badge/github.com/khulnasoft/dazzle)](https://goreportcard.com/report/github.com/khulnasoft/dazzle)
 [![Stability: Experimental](https://masterminds.github.io/stability/experimental.svg)](https://masterminds.github.io/stability/experimental.html)
 
 dazzle is a rather experimental Docker/OCI image builder. Its goal is to build independent layers where a change to one layer does *not* invalidate the ones sitting "above" it.
 
-**Beware** Recently the format for [dazzle builds was changed](https://github.com/gitpod-io/dazzle/commit/ceaa19ef6562e03108c8ea9474d2c627a452a7ca), moving from a single Dockerfile to one per "chunk"/layer. It is also about 5x faster, more reliable and less hacky.
+**Beware** Recently the format for [dazzle builds was changed](https://github.com/khulnasoft/dazzle/commit/ceaa19ef6562e03108c8ea9474d2c627a452a7ca), moving from a single Dockerfile to one per "chunk"/layer. It is also about 5x faster, more reliable and less hacky.
 
 ## How does it work?
 dazzle has three main capabilities.
@@ -31,7 +31,7 @@ For example, if you're building an image that serves as a collection of tools, t
 Install and run [buildkit](https://github.com/moby/buildkit/releases) - currently 0.10.1 - in the background.
 Pull and run a docker registry.
 
-NOTE: if you are running it in Gitpod this is done for you!
+NOTE: if you are running it in Khulnasoft this is done for you!
 
 ```bash
 sudo su -c "cd /usr; curl -L https://github.com/moby/buildkit/releases/download/v0.10.1/buildkit-v0.10.1.linux-amd64.tar.gz | tar xvz"

cmd/core/build.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ import (
 	"github.com/moby/buildkit/client"
 	"github.com/spf13/cobra"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
+	"github.com/khulnasoft/dazzle/pkg/dazzle"
 )
 
 // buildCmd represents the build command

cmd/core/combine.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
+	"github.com/khulnasoft/dazzle/pkg/dazzle"
 )
 
 // combineCmd represents the build command

cmd/core/project-add-combination.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
+	"github.com/khulnasoft/dazzle/pkg/dazzle"
 )
 
 var projectAddCombinationCmd = &cobra.Command{

cmd/core/project-hash.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
+	"github.com/khulnasoft/dazzle/pkg/dazzle"
 )
 
 var projectHashCmd = &cobra.Command{

cmd/core/project-ignore.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
+	"github.com/khulnasoft/dazzle/pkg/dazzle"
 )
 
 var projectIgnoreCmd = &cobra.Command{

cmd/core/project-image-name.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
+	"github.com/khulnasoft/dazzle/pkg/dazzle"
 )
 
 var projectImageNameOpts struct {

cmd/core/project-init.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
+	"github.com/khulnasoft/dazzle/pkg/dazzle"
 )
 
 // projectInitCmd represents the version command

cmd/core/project-manifest.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/gitpod-io/dazzle/pkg/dazzle"
+	"github.com/khulnasoft/dazzle/pkg/dazzle"
 )
 
 var projectManifestCmd = &cobra.Command{

cmd/core/project.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

cmd/core/root.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/gitpod-io/dazzle/pkg/fancylog"
+	"github.com/khulnasoft/dazzle/pkg/fancylog"
 )
 
 var rootCfg struct {

cmd/core/version.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

cmd/util/root.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

cmd/util/test-add.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -34,8 +34,8 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
 
-	"github.com/gitpod-io/dazzle/pkg/fancylog"
-	"github.com/gitpod-io/dazzle/pkg/test"
+	"github.com/khulnasoft/dazzle/pkg/fancylog"
+	"github.com/khulnasoft/dazzle/pkg/test"
 )
 
 var testAddCmd = &cobra.Command{
@@ -159,11 +159,13 @@ func splitCommand(cmd string) ([]string, error) {
 }
 
 func addAssertions(spec *test.Spec, runres *test.RunResult) error {
-	// don't let log messages interfere with prompt
+	// Set log level to prevent log messages from interfering with the prompt
 	log.SetLevel(log.WarnLevel)
 
+	// Serialize stdout and stderr for display
 	stdout, _ := json.Marshal(string(runres.Stdout))
 	stderr, _ := json.Marshal(string(runres.Stderr))
+
 	fmt.Println("Available variables are:")
 	color.Info.Print("stdout: ")
 	fmt.Println(string(stdout))
@@ -173,6 +175,7 @@ func addAssertions(spec *test.Spec, runres *test.RunResult) error {
 	fmt.Println(runres.StatusCode)
 
 	for {
+		// Prompt for adding an assertion
 		p := promptui.Prompt{
 			Label:     "Assertion",
 			AllowEdit: true,
@@ -184,7 +187,8 @@ func addAssertions(spec *test.Spec, runres *test.RunResult) error {
 				}
 
 				if res.Failure != nil {
-					return fmt.Errorf(res.Failure.Message)
+					// Safely format the error message
+					return fmt.Errorf("%s", res.Failure.Message)
 				}
 
 				return nil
@@ -196,6 +200,7 @@ func addAssertions(spec *test.Spec, runres *test.RunResult) error {
 		}
 		spec.Assertions = append(spec.Assertions, a)
 
+		// Prompt to ask if another assertion should be added
 		p = promptui.Prompt{
 			Label:     "Add another assertion?",
 			IsConfirm: true,
@@ -205,6 +210,7 @@ func addAssertions(spec *test.Spec, runres *test.RunResult) error {
 		if err != nil && err != promptui.ErrAbort {
 			return err
 		}
+		// Break if the user chooses not to continue
 		if strings.TrimSpace(cont) != "" && strings.ToLower(cont) != "y" {
 			break
 		}

cmd/util/test-run.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,8 @@ import (
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
 
-	"github.com/gitpod-io/dazzle/pkg/fancylog"
-	"github.com/gitpod-io/dazzle/pkg/test"
+	"github.com/khulnasoft/dazzle/pkg/fancylog"
+	"github.com/khulnasoft/dazzle/pkg/test"
 )
 
 var testRunCmd = &cobra.Command{

cmd/util/test.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

cmd/util/version.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

go.mod

@@ -1,4 +1,4 @@
-module github.com/gitpod-io/dazzle
+module github.com/khulnasoft/dazzle
 
 go 1.19
 

integration_tests.sh

@@ -3,4 +3,4 @@
 # Run the integration tests
 # NOTE: the TARGET_REF is hostname:port 
 # shellcheck disable=SC2034
-BUILDKIT_ADDR=unix:///run/buildkit/buildkitd.sock TARGET_REF=127.0.0.1:5000 go test -count 1 -run ^Test.*_integration$ github.com/gitpod-io/dazzle/pkg/dazzle -v
+BUILDKIT_ADDR=unix:///run/buildkit/buildkitd.sock TARGET_REF=127.0.0.1:5000 go test -count 1 -run ^Test.*_integration$ github.com/khulnasoft/dazzle/pkg/dazzle -v

main-util.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
 
 package main
 
-import cmd "github.com/gitpod-io/dazzle/cmd/util"
+import cmd "github.com/khulnasoft/dazzle/cmd/util"
 
 func main() {
 	cmd.Execute()

main.go

@@ -1,4 +1,4 @@
-// Copyright © 2020 Gitpod
+// Copyright © 2020 Khulnasoft
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
 
 package main
 
-import cmd "github.com/gitpod-io/dazzle/cmd/core"
+import cmd "github.com/khulnasoft/dazzle/cmd/core"
 
 func main() {
 	cmd.Execute()