Skip to content

Commit

Permalink
align package names with folder names (#906)
Browse files Browse the repository at this point in the history
<!-- markdownlint-disable MD041 -->
#### What this PR does / why we need it
Because of an error in the migration script some package renames
resulted in a mismatch of the folder name
of the package and its name.

This PR fixes this, and also aligns some packages which had the wrong
names even before the migration.
  • Loading branch information
mandelsoft authored Sep 2, 2024
1 parent 1682667 commit 05630ea
Show file tree
Hide file tree
Showing 31 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion api/cli/builder.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clictx
package cli

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion api/cli/interface.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clictx
package cli

import (
"ocm.software/ocm/api/cli/internal"
Expand Down
2 changes: 1 addition & 1 deletion api/oci/types/interface.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cpi
package types

// This is the Context Provider Interface for credential providers

Expand Down
2 changes: 1 addition & 1 deletion api/ocm/compdesc/normalizations/init.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package versions
package normalizations

import (
_ "ocm.software/ocm/api/ocm/compdesc/normalizations/jsonv1"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/elements/artifactaccess/ociblobaccess/options.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package github
package ociblobaccess

import (
"github.com/mandelsoft/goutils/optionutils"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/elements/artifactaccess/ociblobaccess/resource.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package github
package ociblobaccess

import (
"github.com/mandelsoft/goutils/optionutils"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/elements/artifactaccess/s3access/options.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package github
package s3access

import (
"github.com/mandelsoft/goutils/optionutils"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/elements/artifactaccess/s3access/resource.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package github
package s3access

import (
"github.com/mandelsoft/goutils/optionutils"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/extensions/artifacttypes/const.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package resourcetypes
package artifacttypes

const (
KIND_ARTIFACT_TYPE = "artifact type"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/ocmutils/configure.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils
package ocmutils

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/ocmutils/resource.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils
package ocmutils

import (
"io"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/ocmutils/resourceref.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils
package ocmutils

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/ocmutils/resourceref_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils_test
package ocmutils_test

import (
"io"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/ocmutils/suite_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils_test
package ocmutils_test

import (
"testing"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/ocmutils/utils.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils
package ocmutils

import (
"github.com/mandelsoft/goutils/errors"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/ocmutils/walk.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utils
package ocmutils

import (
"github.com/mandelsoft/goutils/errors"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/tools/transfer/transferhandler/config/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package scriptoption
package config

import (
cfgcpi "ocm.software/ocm/api/config/cpi"
Expand Down
2 changes: 1 addition & 1 deletion api/ocm/types/interface.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package context
package types

import (
"ocm.software/ocm/api/ocm/internal"
Expand Down
2 changes: 1 addition & 1 deletion api/utils/misc/const.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package common
package misc

const OCM_TYPE_GROUP_SUFFIX = ".ocm.software"
2 changes: 1 addition & 1 deletion api/utils/misc/history.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package misc

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion api/utils/misc/history_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common_test
package misc_test

import (
. "github.com/onsi/ginkgo/v2"
Expand Down
2 changes: 1 addition & 1 deletion api/utils/misc/printer.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package misc

import (
"bytes"
Expand Down
2 changes: 1 addition & 1 deletion api/utils/misc/printer_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package misc

import (
"bytes"
Expand Down
2 changes: 1 addition & 1 deletion api/utils/misc/properties.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package misc

import (
"encoding/json"
Expand Down
2 changes: 1 addition & 1 deletion api/utils/misc/suite_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common_test
package misc_test

import (
"testing"
Expand Down
2 changes: 1 addition & 1 deletion api/utils/misc/types.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package misc

import (
"encoding/json"
Expand Down
2 changes: 1 addition & 1 deletion api/utils/misc/utils.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package misc

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion api/utils/misc/walk.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package misc

import (
"github.com/mandelsoft/logging"
Expand Down
2 changes: 1 addition & 1 deletion cmds/ocm/commands/misccmds/config/cmd.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package credentials
package config

import (
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion cmds/ocm/commands/misccmds/hash/cmd.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package credentials
package hash

import (
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion cmds/ocm/commands/ocmcmds/common/inputs/types/init.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package handlers
package types

import (
_ "ocm.software/ocm/cmds/ocm/commands/ocmcmds/common/inputs/types/binary"
Expand Down

0 comments on commit 05630ea

Please sign in to comment.