chore: revert name change & add nolint comment

strangelove-ventures · Oct 6, 2024 · 0e64f2c · 0e64f2c
1 parent 50aa16d
commit 0e64f2c
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/chain/cosmos/chain_node.go b/chain/cosmos/chain_node.go
@@ -192,7 +192,7 @@ func (tn *ChainNode) NewSidecarProcess(
 		VolumeName: v.Name,
 		ImageRef:   image.Ref(),
 		TestName:   tn.TestName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return fmt.Errorf("set volume owner: %w", err)
 	}

diff --git a/chain/cosmos/cosmos_chain.go b/chain/cosmos/cosmos_chain.go
@@ -673,7 +673,7 @@ func (c *CosmosChain) NewChainNode(
 		VolumeName: v.Name,
 		ImageRef:   image.Ref(),
 		TestName:   testName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return nil, fmt.Errorf("set volume owner: %w", err)
 	}
@@ -730,7 +730,7 @@ func (c *CosmosChain) NewSidecarProcess(
 		VolumeName: v.Name,
 		ImageRef:   image.Ref(),
 		TestName:   testName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return fmt.Errorf("set volume owner: %w", err)
 	}

diff --git a/chain/ethereum/ethererum_chain.go b/chain/ethereum/ethererum_chain.go
@@ -93,7 +93,7 @@ func (c *EthereumChain) Initialize(ctx context.Context, testName string, cli *do
 		VolumeName: v.Name,
 		ImageRef:   image.Ref(),
 		TestName:   testName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return fmt.Errorf("set volume owner: %w", err)
 	}

diff --git a/chain/internal/tendermint/tendermint_node.go b/chain/internal/tendermint/tendermint_node.go
@@ -77,7 +77,7 @@ func NewTendermintNode(
 		VolumeName: tn.VolumeName,
 		ImageRef:   tn.Image.Ref(),
 		TestName:   tn.TestName,
-		UIDGID:     tn.Image.UIDGID,
+		UidGid:     tn.Image.UIDGID,
 	}); err != nil {
 		return nil, fmt.Errorf("set tendermint volume owner: %w", err)
 	}

diff --git a/chain/penumbra/penumbra_app_node.go b/chain/penumbra/penumbra_app_node.go
@@ -79,7 +79,7 @@ func NewPenumbraAppNode(
 		VolumeName: pn.VolumeName,
 		ImageRef:   pn.Image.Ref(),
 		TestName:   pn.TestName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return nil, fmt.Errorf("set penumbra volume owner: %w", err)
 	}

diff --git a/chain/penumbra/penumbra_client_node.go b/chain/penumbra/penumbra_client_node.go
@@ -110,7 +110,7 @@ func NewClientNode(
 		VolumeName: p.VolumeName,
 		ImageRef:   image.Ref(),
 		TestName:   testName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return nil, fmt.Errorf("set pclientd volume owner: %w", err)
 	}

diff --git a/chain/polkadot/polkadot_chain.go b/chain/polkadot/polkadot_chain.go
@@ -178,7 +178,7 @@ func (c *PolkadotChain) NewRelayChainNode(
 		VolumeName: v.Name,
 		ImageRef:   image.Ref(),
 		TestName:   testName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return nil, fmt.Errorf("set volume owner: %w", err)
 	}
@@ -233,7 +233,7 @@ func (c *PolkadotChain) NewParachainNode(
 		VolumeName: v.Name,
 		ImageRef:   parachainConfig.Image.Ref(),
 		TestName:   testName,
-		UIDGID:     parachainConfig.Image.UIDGID,
+		UidGid:     parachainConfig.Image.UIDGID,
 	}); err != nil {
 		return nil, fmt.Errorf("set volume owner: %w", err)
 	}

diff --git a/chain/thorchain/thorchain.go b/chain/thorchain/thorchain.go
@@ -506,7 +506,7 @@ func (c *Thorchain) NewChainNode(
 		VolumeName: v.Name,
 		ImageRef:   image.Ref(),
 		TestName:   testName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return nil, fmt.Errorf("set volume owner: %w", err)
 	}
@@ -569,7 +569,7 @@ func (c *Thorchain) NewSidecarProcess(
 		VolumeName: v.Name,
 		ImageRef:   image.Ref(),
 		TestName:   testName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return fmt.Errorf("set volume owner: %w", err)
 	}

diff --git a/chain/thorchain/thornode.go b/chain/thorchain/thornode.go
@@ -189,7 +189,7 @@ func (tn *ChainNode) NewSidecarProcess(
 		VolumeName: v.Name,
 		ImageRef:   image.Ref(),
 		TestName:   tn.TestName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return fmt.Errorf("set volume owner: %w", err)
 	}

diff --git a/chain/utxo/utxo_chain.go b/chain/utxo/utxo_chain.go
@@ -130,7 +130,7 @@ func (c *UtxoChain) Initialize(ctx context.Context, testName string, cli *docker
 		VolumeName: v.Name,
 		ImageRef:   image.Ref(),
 		TestName:   testName,
-		UIDGID:     image.UIDGID,
+		UidGid:     image.UIDGID,
 	}); err != nil {
 		return fmt.Errorf("set volume owner: %w", err)
 	}

diff --git a/dockerutil/volumeowner.go b/dockerutil/volumeowner.go
@@ -20,12 +20,12 @@ type VolumeOwnerOptions struct {
 	VolumeName string
 	ImageRef   string
 	TestName   string
-	UIDGID     string
+	UidGid     string //nolint: stylecheck
 }
 
 // SetVolumeOwner configures the owner of a volume to match the default user in the supplied image reference.
 func SetVolumeOwner(ctx context.Context, opts VolumeOwnerOptions) error {
-	owner := opts.UIDGID
+	owner := opts.UidGid
 	if owner == "" {
 		owner = GetRootUserString()
 	}

diff --git a/ibc/types.go b/ibc/types.go
@@ -338,7 +338,7 @@ func (i DockerImage) Validate() error {
 		missing = append(missing, "Repository")
 	}
 	if i.UIDGID == "" {
-		missing = append(missing, "UIDGID")
+		missing = append(missing, "UidGid")
 	}
 
 	if len(missing) > 0 {

diff --git a/relayer/docker.go b/relayer/docker.go
@@ -105,7 +105,7 @@ func NewDockerRelayer(ctx context.Context, log *zap.Logger, testName string, cli
 		VolumeName: r.volumeName,
 		ImageRef:   containerImage.Ref(),
 		TestName:   testName,
-		UIDGID:     containerImage.UIDGID,
+		UidGid:     containerImage.UIDGID,
 	}); err != nil {
 		return nil, fmt.Errorf("set volume owner: %w", err)
 	}