Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion e2e/tests/up-docker-compose/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var _ = ginkgo.Describe(
composeHelper, err = compose.NewComposeHelper(dockerHelper)
framework.ExpectNoError(err)

f, err = setupDockerProvider(initialDir+"/bin", "docker")
f, err = setupDockerProvider(initialDir + "/bin")
framework.ExpectNoError(err)
})

Expand Down
12 changes: 6 additions & 6 deletions e2e/tests/up-docker-compose/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var _ = ginkgo.Describe(
tc.composeHelper, err = compose.NewComposeHelper(tc.dockerHelper)
framework.ExpectNoError(err)

tc.f, err = setupDockerProvider(tc.initialDir+"/bin", "docker")
tc.f, err = setupDockerProvider(tc.initialDir + "/bin")
framework.ExpectNoError(err)
})

Expand Down Expand Up @@ -199,7 +199,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)

_, detail, err := tc.getAppContainer(ctx, workspace)
detail, err := tc.getAppContainer(ctx, workspace)
framework.ExpectNoError(err)
gomega.Expect(detail.Config.Entrypoint).
NotTo(gomega.ContainElement("bash"), "overrides container entry point")
Expand Down Expand Up @@ -336,7 +336,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)

_, detail, err := tc.getAppContainer(ctx, workspace)
detail, err := tc.getAppContainer(ctx, workspace)
framework.ExpectNoError(err)
gomega.Expect(detail.HostConfig.Privileged).
To(gomega.BeTrue(), "container run with privileged true")
Expand All @@ -349,7 +349,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)

_, detail, err := tc.getAppContainer(ctx, workspace)
detail, err := tc.getAppContainer(ctx, workspace)
framework.ExpectNoError(err)
gomega.Expect(detail.HostConfig.CapAdd).
To(gomega.Or(gomega.ContainElement("SYS_PTRACE"), gomega.ContainElement("CAP_SYS_PTRACE")),
Expand All @@ -366,7 +366,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)

_, detail, err := tc.getAppContainer(ctx, workspace)
detail, err := tc.getAppContainer(ctx, workspace)
framework.ExpectNoError(err)
gomega.Expect(detail.HostConfig.SecurityOpt).
To(gomega.ContainElement("seccomp=unconfined"), "securityOpts contain seccomp=unconfined")
Expand Down Expand Up @@ -577,7 +577,7 @@ var _ = ginkgo.Describe(
framework.ExpectNoError(err)

btc.f, err = setupDockerProvider(
filepath.Join(btc.initialDir, "bin"), "docker",
filepath.Join(btc.initialDir, "bin"),
)
framework.ExpectNoError(err)
})
Expand Down
15 changes: 7 additions & 8 deletions e2e/tests/up-docker-compose/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,12 @@ func (tc *testContext) setupAndStartWorkspace(
func (tc *testContext) getAppContainer(
ctx context.Context,
workspace *provider2.Workspace,
) ([]string, *container.InspectResponse, error) {
) (*container.InspectResponse, error) {
ids, err := findComposeContainer(ctx, tc.dockerHelper, tc.composeHelper, workspace.UID, "app")
if err != nil || len(ids) == 0 {
return ids, nil, err
if err != nil {
return nil, err
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
detail, err := tc.inspectContainer(ctx, ids)
return ids, detail, err
return tc.inspectContainer(ctx, ids)
}

func (tc *testContext) findAppAndSidecar(
Expand Down Expand Up @@ -158,7 +157,7 @@ func (tc *testContext) verifyWorkspaceMount(
workspace *provider2.Workspace,
tempDir string,
) error {
_, detail, err := tc.getAppContainer(ctx, workspace)
detail, err := tc.getAppContainer(ctx, workspace)
if err != nil {
return err
}
Expand All @@ -183,8 +182,8 @@ func setupWorkspace(testdataPath, initialDir string, f *framework.Framework) (st
return tempDir, nil
}

func setupDockerProvider(binDir, dockerPath string) (*framework.Framework, error) {
return framework.SetupDockerProvider(binDir, dockerPath)
func setupDockerProvider(binDir string) (*framework.Framework, error) {
return framework.SetupDockerProvider(binDir, "docker")
}

func findComposeContainer(
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/up-docker-compose/up_docker_compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var _ = ginkgo.Describe(
tc.composeHelper, err = compose.NewComposeHelper(tc.dockerHelper)
framework.ExpectNoError(err)

tc.f, err = setupDockerProvider(tc.initialDir+"/bin", "docker")
tc.f, err = setupDockerProvider(tc.initialDir + "/bin")
framework.ExpectNoError(err)
})

Expand Down
1 change: 1 addition & 0 deletions e2e/tests/up-features/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ func addFileToTar(tarWriter *tar.Writer, filePath string) error {
return err
}

//nolint:unparam // dockerPath is "podman" for the windows-only caller in wsl.go
func setupDockerProvider(binDir, dockerPath string) (*framework.Framework, error) {
return framework.SetupDockerProvider(binDir, dockerPath)
}
11 changes: 4 additions & 7 deletions pkg/copy/copy.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func Chown(path string, userName string) error {
return nil
}

uid, _ := parseUserSpec(userName)
uid := parseUserSpec(userName)
userID, err := lookupUser(uid)
if err != nil {
return fmt.Errorf("lookup user: %w", err)
Expand All @@ -33,7 +33,7 @@ func ChownR(path string, userName string) error {
return nil
}

uid, _ := parseUserSpec(userName)
uid := parseUserSpec(userName)
userID, err := lookupUser(uid)
if err != nil {
return fmt.Errorf("lookup user: %w", err)
Expand Down Expand Up @@ -215,10 +215,7 @@ func lookupUser(uid string) (*user.User, error) {
return userID, err
}

func parseUserSpec(userSpec string) (string, string) {
func parseUserSpec(userSpec string) string {
parts := strings.SplitN(userSpec, ":", 2)
if len(parts) == 2 {
return parts[0], parts[1]
}
return parts[0], ""
return parts[0]
}
5 changes: 1 addition & 4 deletions pkg/daemon/platform/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,7 @@ func Init(ctx context.Context, config InitConfig) (*Daemon, error) {
return nil, fmt.Errorf("create tailscale server: %w", err)
}

localServer, err := newLocalServer(lc, config.PlatformClient, config.Context)
if err != nil {
return nil, fmt.Errorf("create local server: %w", err)
}
localServer := newLocalServer(lc, config.PlatformClient, config.Context)

return &Daemon{
socketListener: socketListener,
Expand Down
12 changes: 6 additions & 6 deletions pkg/daemon/platform/local_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func newLocalServer(
lc *local.Client,
pc platformclient.Client,
devsyContext string,
) (*localServer, error) {
) *localServer {
l := &localServer{
lc: lc,
pc: pc,
Expand Down Expand Up @@ -124,7 +124,7 @@ func newLocalServer(
handler = handlers.LoggingHandler(log.Writer(log.LevelDebug), handler)
l.httpServer = &http.Server{Handler: handler}

return l, nil
return l
}

type panicLogger struct{}
Expand All @@ -137,8 +137,8 @@ func (l *localServer) ListenAndServe() error {
errChan := make(chan error, 1)
go func() {
log.Info("Start config watcher")
err := l.watchPlatform(l.stopChan)
errChan <- err
l.watchPlatform(l.stopChan)
errChan <- nil
}()
go func() {
err := l.httpServer.Serve(l.listener)
Expand Down Expand Up @@ -168,7 +168,7 @@ func (l *localServer) Dial(ctx context.Context, network, addr string) (net.Conn,
return l.listener.Dial(ctx, network, addr)
}

func (l *localServer) watchPlatform(stopChan <-chan struct{}) error {
func (l *localServer) watchPlatform(stopChan <-chan struct{}) {
for {
log.Debug("Check platform status")

Expand All @@ -185,7 +185,7 @@ func (l *localServer) watchPlatform(stopChan <-chan struct{}) error {

select {
case <-stopChan:
return nil
return
case <-time.After(platformStatusCheckInterval):
}
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/driver/kubernetes/init_container.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ func (k *KubernetesDriver) getInitContainers(
options *driver.RunOptions,
pod *corev1.Pod,
initialize bool,
) ([]corev1.Container, error) {
) []corev1.Container {
if !initialize {
// don't build init container and clean up existing one if defined
return filterOutInitContainer(pod.Spec.InitContainers), nil
return filterOutInitContainer(pod.Spec.InitContainers)
}

volumeMounts, commands := buildVolumeCopyCommands(options)
Expand All @@ -25,7 +25,7 @@ func (k *KubernetesDriver) getInitContainers(

// check if there is at least one mount
if len(volumeMounts) == 0 {
return retContainers, nil
return retContainers
}

securityContext := &corev1.SecurityContext{
Expand Down Expand Up @@ -55,7 +55,7 @@ func (k *KubernetesDriver) getInitContainers(
mergeContainer(&initContainer, existingInitContainer)

retContainers = append(retContainers, initContainer)
return retContainers, nil
return retContainers
}

func filterOutInitContainer(containers []corev1.Container) []corev1.Container {
Expand Down
21 changes: 6 additions & 15 deletions pkg/driver/kubernetes/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ func GetRegistryFromImageName(imageName string) (string, error) {
return "", err
}

repoInfo, err := newIndexInfo(reference.Domain(ref))
if err != nil {
return "", err
}
repoInfo := newIndexInfo(reference.Domain(ref))

if !strings.ContainsRune(reference.FamiliarName(ref), '/') || repoInfo == "hub.docker.com" ||
repoInfo == "docker.io" {
Expand All @@ -30,22 +27,16 @@ func GetRegistryFromImageName(imageName string) (string, error) {

// validateIndexName validates an index name. It is used by the daemon to
// validate the daemon configuration.
func validateIndexName(val string) (string, error) {
func validateIndexName(val string) string {
// TODO: upstream this to check to reference package
if val == "index.docker.io" {
val = "docker.io"
}
return val, nil
return val
}

// newIndexInfo returns IndexInfo configuration from indexName.
func newIndexInfo(indexName string) (string, error) {
var err error
indexName, err = validateIndexName(indexName)
if err != nil {
return "", err
}

// newIndexInfo returns the normalized registry name for indexName.
func newIndexInfo(indexName string) string {
// Construct a non-configured index info.
return indexName, nil
return validateIndexName(indexName)
}
5 changes: 1 addition & 4 deletions pkg/driver/kubernetes/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,7 @@ func (k *KubernetesDriver) buildPod(
return nil, err
}

initContainers, err := k.getInitContainers(options, pod, initialize)
if err != nil {
return nil, fmt.Errorf("build init container: %w", err)
}
initContainers := k.getInitContainers(options, pod, initialize)

volumeMounts, tmpfsVolumes := buildVolumeMounts(mount, options)
capabilities := buildCapabilities(options.CapAdd)
Expand Down
8 changes: 3 additions & 5 deletions pkg/platform/kubeconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ func directClusterEndpointKubeConfigForSpace(
host,
directClusterEndpointToken.Status.Token,
p.spaceInstance.Spec.ClusterRef.Namespace,
true,
), nil
}

Expand Down Expand Up @@ -250,7 +249,7 @@ func kubeConfigViaAccessKey(p accessKeyKubeConfigParams) (*clientcmdapi.Config,
p.resourceName,
)

return newKubeConfig(host, ownedAccessKey.Spec.Key, p.clusterRefNamespace, true), nil
return newKubeConfig(host, ownedAccessKey.Spec.Key, p.clusterRefNamespace), nil
}

func kubeConfigForVirtualClusterInstance(
Expand Down Expand Up @@ -445,7 +444,6 @@ func directClusterEndpointKubeConfig(
host,
directClusterEndpointToken.Status.Token,
req.instance.Spec.ClusterRef.Namespace,
true,
), nil
}

Expand Down Expand Up @@ -476,7 +474,7 @@ func findHostCluster(
return managementv1.Cluster{}, nil
}

func newKubeConfig(host, token, namespace string, insecure bool) *clientcmdapi.Config {
func newKubeConfig(host, token, namespace string) *clientcmdapi.Config {
contextName := "loft"
kubeConfig := clientcmdapi.NewConfig()
kubeConfig.Contexts = map[string]*clientcmdapi.Context{
Expand All @@ -489,7 +487,7 @@ func newKubeConfig(host, token, namespace string, insecure bool) *clientcmdapi.C
kubeConfig.Clusters = map[string]*clientcmdapi.Cluster{
contextName: {
Server: host,
InsecureSkipTLSVerify: insecure,
InsecureSkipTLSVerify: true,
},
}
kubeConfig.AuthInfos = map[string]*clientcmdapi.AuthInfo{
Expand Down
12 changes: 3 additions & 9 deletions pkg/telemetry/collect.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,7 @@ func BootstrapCLI(cmd *cobra.Command) CLICollector {
return &noopCollector{}
}

collector, err := newCLICollector(cmd)
if err != nil {
log.Infof("telemetry: %s", err.Error())
return &noopCollector{}
}
collector := newCLICollector(cmd)
return collector
}

Expand All @@ -91,13 +87,11 @@ func ApplyCLIConfig(devsyConfig *config.Config, current CLICollector) CLICollect
return current
}

func newCLICollector(cmd *cobra.Command) (*cliCollector, error) {
defaultCollector := &cliCollector{
func newCLICollector(cmd *cobra.Command) *cliCollector {
return &cliCollector{
analyticsClient: analytics.NewClient(),
cmd: cmd,
}

return defaultCollector, nil
}

type cliCollector struct {
Expand Down
Loading
Loading