Skip to content

refactor: use maps.Copy for cleaner map handling #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: use maps.Copy for cleaner map handling #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions playground/artifacts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"fmt"
"io"
"log"
"maps"
"math/big"
"os"
"path/filepath"
Expand Down Expand Up @@ -201,9 +202,7 @@ func (b *ArtifactsBuilder) Build() (*Artifacts, error) {
if err := json.Unmarshal(contents, &alloc); err != nil {
return nil, fmt.Errorf("failed to unmarshal opState: %w", err)
}
for addr, account := range alloc {
gen.Alloc[addr] = account
}
maps.Copy(gen.Alloc, alloc)
}

block := gen.ToBlock()
Expand Down
9 changes: 3 additions & 6 deletions playground/local_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"fmt"
"maps"
"net"
"os"
"os/exec"
Expand Down Expand Up @@ -134,9 +135,7 @@ func NewLocalRunner(cfg *RunnerConfig) (*LocalRunner, error) {
if cfg.Overrides == nil {
cfg.Overrides = make(map[string]string)
}
for k, v := range cfg.Manifest.overrides {
cfg.Overrides[k] = v
}
maps.Copy(cfg.Overrides, cfg.Manifest.overrides)

// Create the concrete instances to run
instances := []*instance{}
Expand Down Expand Up @@ -627,9 +626,7 @@ func (d *LocalRunner) toDockerComposeService(s *Service) (map[string]interface{}
}

// apply the user defined labels
for k, v := range d.labels {
labels[k] = v
}
maps.Copy(labels, d.labels)

// add the local ports exposed by the service as labels
// we have to do this for now since we do not store the manifest in JSON yet.
Expand Down