Merge pull request #1020 from AkihiroSuda/dev

CI: update Go (1.19)

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: 1.18.x
+        go-version: 1.19.x
     - uses: actions/checkout@v3
       with:
         fetch-depth: 1
@@ -40,7 +40,7 @@ jobs:
         path: _artifacts/
     - uses: actions/setup-go@v3
       with:
-        go-version: 1.18.x
+        go-version: 1.19.x
     - name: Install gcc-aarch64-linux-gnu
       run: |
         sudo apt-get update

.github/workflows/test.yml

@@ -15,14 +15,14 @@ jobs:
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: 1.18.x
+        go-version: 1.19.x
     - uses: actions/checkout@v3
       with:
         fetch-depth: 1
     - name: Run golangci-lint
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.45.2
+        version: v1.48.0
         args: --verbose
     - name: Run yamllint
       run: yamllint .
@@ -58,7 +58,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: 1.18.x
+        go-version: 1.19.x
     - uses: actions/checkout@v3
       with:
         fetch-depth: 1
@@ -79,7 +79,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: 1.18.x
+        go-version: 1.19.x
     - uses: actions/checkout@v3
       with:
         fetch-depth: 1
@@ -165,7 +165,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: 1.18.x
+        go-version: 1.19.x
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
@@ -191,7 +191,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: 1.18.x
+        go-version: 1.19.x
     - uses: actions/checkout@v3
       with:
         fetch-depth: 1
@@ -205,7 +205,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v3
       with:
-        go-version: 1.18.x
+        go-version: 1.19.x
     - name: Install gcc-aarch64-linux-gnu
       run: |
         sudo apt-get update

go.mod

@@ -1,6 +1,6 @@
 module github.com/lima-vm/lima
 
-go 1.18
+go 1.19
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.5

pkg/guestagent/iptables/iptables.go

@@ -20,8 +20,10 @@ type Entry struct {
 // This regex can detect a line in the iptables added by portmap to do the
 // forwarding. The following two are examples of lines (notice that one has the
 // destination IP and the other does not):
-//    -A CNI-DN-2e2f8d5b91929ef9fc152 -d 127.0.0.1/32 -p tcp -m tcp --dport 8081 -j DNAT --to-destination 10.4.0.7:80
-//    -A CNI-DN-04579c7bb67f4c3f6cca0 -p tcp -m tcp --dport 8082 -j DNAT --to-destination 10.4.0.10:80
+//
+//	-A CNI-DN-2e2f8d5b91929ef9fc152 -d 127.0.0.1/32 -p tcp -m tcp --dport 8081 -j DNAT --to-destination 10.4.0.7:80
+//	-A CNI-DN-04579c7bb67f4c3f6cca0 -p tcp -m tcp --dport 8082 -j DNAT --to-destination 10.4.0.10:80
+//
 // The -A on the front is to amend the rule that was already created. portmap
 // ensures the rule is created before creating this line so it is always -A.
 // CNI-DN- is the prefix used for rule for an individual container.

pkg/limayaml/defaults.go

@@ -70,10 +70,10 @@ func MACAddress(uniqueID string) string {
 // matching rule terminates the search).
 //
 // Exceptions:
-// - Mounts are appended in d, y, o order, but "merged" when the Location matches a previous entry;
-//   the highest priority Writable setting wins.
-// - DNS are picked from the highest priority where DNS is not empty.
-// - CACertificates Files and Certs are uniquely appended
+//   - Mounts are appended in d, y, o order, but "merged" when the Location matches a previous entry;
+//     the highest priority Writable setting wins.
+//   - DNS are picked from the highest priority where DNS is not empty.
+//   - CACertificates Files and Certs are uniquely appended
 func FillDefault(y, d, o *LimaYAML, filePath string) {
 	if y.Arch == nil {
 		y.Arch = d.Arch