Skip to content

Stablize spec 3.0.0 #772

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

Merged
jlebon merged 3 commits into from
Mar 26, 2019
Merged

Stablize spec 3.0.0 #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca84f7e
*: stablize spec 3.0.0
Mar 25, 2019
c240f47
tests: make servers generate their own hashes
Mar 25, 2019
9bd1f0f
tests/positive/general: use hashes from server
Mar 25, 2019
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
6 changes: 3 additions & 3 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package config
import (
Copy link
Contributor

@arithx arithx Mar 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: Should we change the commit title to *: stabilize spec 3.0.0?

"github.com/coreos/ignition/config/shared/errors"
"github.com/coreos/ignition/config/util"
"github.com/coreos/ignition/config/v3_0_experimental"
"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/config/validate/report"

"github.com/coreos/go-semver/semver"
Expand Down Expand Up @@ -50,7 +50,7 @@ func Parse(raw []byte) (types.Config, report.Report, error) {

switch *version {
case types.MaxVersion:
return v3_0_experimental.Parse(raw)
return v3_0.Parse(raw)
default:
return types.Config{}, report.Report{}, errors.ErrUnknownVersion
}
Expand Down
4 changes: 2 additions & 2 deletions config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"testing"

"github.com/coreos/ignition/config/util"
v3_0_experimental "github.com/coreos/ignition/config/v3_0_experimental/types"
v3_0 "github.com/coreos/ignition/config/v3_0/types"
)

func testConfigType(t reflect.Type) error {
Expand Down Expand Up @@ -83,7 +83,7 @@ func testConfigType(t reflect.Type) error {
// anything the merge, translation, or validation logic doesn't know how to handle
func TestConfigStructure(t *testing.T) {
configs := []reflect.Type{
reflect.TypeOf(v3_0_experimental.Config{}),
reflect.TypeOf(v3_0.Config{}),
}

for _, configType := range configs {
Expand Down
2 changes: 1 addition & 1 deletion config/merge/merge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"testing"

"github.com/coreos/ignition/config/util"
"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"

"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions config/v3_0_experimental/config.go → config/v3_0/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v3_0_experimental
package v3_0

import (
"reflect"

"github.com/coreos/ignition/config/merge"
"github.com/coreos/ignition/config/shared/errors"
"github.com/coreos/ignition/config/util"
"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/config/validate"
"github.com/coreos/ignition/config/validate/report"

Expand Down
6 changes: 3 additions & 3 deletions config/v3_0_experimental/config_test.go → config/v3_0/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v3_0_experimental
package v3_0

import (
"testing"

"github.com/coreos/ignition/config/shared/errors"
"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/stretchr/testify/assert"
)

Expand Down Expand Up @@ -81,7 +81,7 @@ func TestParse(t *testing.T) {
out: out{err: errors.ErrUnknownVersion},
},
{
in: in{config: []byte(`{"ignition": {"version": "3.0.0-experimental"}}`)},
in: in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)},
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
},
{
Expand Down
0 ...ig/v3_0_experimental/schema/ignition.json → config/v3_0/schema/ignition.json
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/ca.go → config/v3_0/types/ca.go
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions config/v3_0_experimental/types/config.go → config/v3_0/types/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ import (

var (
MaxVersion = semver.Version{
Major: 3,
Minor: 0,
PreRelease: "experimental",
Major: 3,
Minor: 0,
}
)

Expand Down
0 config/v3_0_experimental/types/directory.go → config/v3_0/types/directory.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/disk.go → config/v3_0/types/disk.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/file.go → config/v3_0/types/file.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/filesystem.go → config/v3_0/types/filesystem.go
View file
Open in desktop
File renamed without changes.
0 ...3_0_experimental/types/filesystem_test.go → config/v3_0/types/filesystem_test.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/ignition.go → config/v3_0/types/ignition.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/mode.go → config/v3_0/types/mode.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/mode_test.go → config/v3_0/types/mode_test.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/node.go → config/v3_0/types/node.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/node_test.go → config/v3_0/types/node_test.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/partition.go → config/v3_0/types/partition.go
View file
Open in desktop
File renamed without changes.
0 ...v3_0_experimental/types/partition_test.go → config/v3_0/types/partition_test.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/passwd.go → config/v3_0/types/passwd.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/path.go → config/v3_0/types/path.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/path_test.go → config/v3_0/types/path_test.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/raid.go → config/v3_0/types/raid.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion config/v3_0_experimental/types/schema.go → config/v3_0/types/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package types

// generated by "schematyper --package=types config/v3_0_experimental/schema/ignition.json -o config/v3_0_experimental/types/schema.go --root-type=Config" -- DO NOT EDIT
// generated by "schematyper --package=types config/v3_0/schema/ignition.json -o config/v3_0/types/schema.go --root-type=Config" -- DO NOT EDIT

type CaReference struct {
Source string `json:"source"`
Expand Down
0 config/v3_0_experimental/types/storage.go → config/v3_0/types/storage.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/unit.go → config/v3_0/types/unit.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/unit_test.go → config/v3_0/types/unit_test.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/url.go → config/v3_0/types/url.go
View file
Open in desktop
File renamed without changes.
0 config/v3_0_experimental/types/url_test.go → config/v3_0/types/url_test.go
View file
Open in desktop
File renamed without changes.
0 ...g/v3_0_experimental/types/verification.go → config/v3_0/types/verification.go
View file
Open in desktop
File renamed without changes.
0 ...0_experimental/types/verification_test.go → config/v3_0/types/verification_test.go
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions config/validate/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/coreos/ignition/config/validate/astjson"
"github.com/coreos/ignition/config/validate/report"
// Import into the same namespace to keep config definitions clean
. "github.com/coreos/ignition/config/v3_0_experimental/types"
. "github.com/coreos/ignition/config/v3_0/types"
)

func TestValidate(t *testing.T) {
Expand Down Expand Up @@ -61,7 +61,7 @@ func TestValidate(t *testing.T) {
out: out{err: errors.ErrUnknownVersion},
},
{
in: in{cfg: Config{Ignition: Ignition{Version: "3.0.0"}}},
in: in{cfg: Config{Ignition: Ignition{Version: "2.0.0"}}},
out: out{err: errors.ErrUnknownVersion},
},
{
Expand All @@ -71,7 +71,7 @@ func TestValidate(t *testing.T) {
{
in: in{cfg: Config{
Ignition: Ignition{
Version: "3.0.0-experimental",
Version: "3.0.0",
Config: IgnitionConfig{
Replace: ConfigReference{
Verification: Verification{
Expand All @@ -85,7 +85,7 @@ func TestValidate(t *testing.T) {
},
{
in: in{cfg: Config{
Ignition: Ignition{Version: "3.0.0-experimental"},
Ignition: Ignition{Version: "3.0.0"},
Storage: Storage{
Filesystems: []Filesystem{
{
Expand All @@ -100,7 +100,7 @@ func TestValidate(t *testing.T) {
},
{
in: in{cfg: Config{
Ignition: Ignition{Version: "3.0.0-experimental"},
Ignition: Ignition{Version: "3.0.0"},
Storage: Storage{
Filesystems: []Filesystem{
{
Expand All @@ -120,7 +120,7 @@ func TestValidate(t *testing.T) {
},
{
in: in{cfg: Config{
Ignition: Ignition{Version: "3.0.0-experimental"},
Ignition: Ignition{Version: "3.0.0"},
Storage: Storage{
Files: []File{
{
Expand Down Expand Up @@ -148,7 +148,7 @@ func TestValidate(t *testing.T) {
},
{
in: in{cfg: Config{
Ignition: Ignition{Version: "3.0.0-experimental"},
Ignition: Ignition{Version: "3.0.0"},
Storage: Storage{
Files: []File{
{
Expand All @@ -174,14 +174,14 @@ func TestValidate(t *testing.T) {
},
{
in: in{cfg: Config{
Ignition: Ignition{Version: "3.0.0-experimental"},
Ignition: Ignition{Version: "3.0.0"},
Systemd: Systemd{Units: []Unit{{Name: "foo.bar", Contents: util.StrToPtr("[Foo]\nfoo=qux")}}},
}},
out: out{err: fmt.Errorf("invalid systemd unit extension")},
},
{
in: in{cfg: Config{
Ignition: Ignition{Version: "3.0.0-experimental"},
Ignition: Ignition{Version: "3.0.0"},
Systemd: Systemd{Units: []Unit{{Name: "enable-but-no-install.service", Enabled: util.BoolToPtr(true), Contents: util.StrToPtr("[Foo]\nlemon=lime")}}},
}},
out: out{warning: errors.NewNoInstallSectionError("enable-but-no-install.service")},
Expand Down
2 changes: 1 addition & 1 deletion generate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ hash schematyper 2>/dev/null || {
exit 1
}

specs="v3_0_experimental"
specs="v3_0"

for spec in $specs
do
Expand Down
4 changes: 2 additions & 2 deletions internal/exec/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"time"

"github.com/coreos/ignition/config/shared/errors"
config "github.com/coreos/ignition/config/v3_0_experimental"
"github.com/coreos/ignition/config/v3_0_experimental/types"
config "github.com/coreos/ignition/config/v3_0"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/config/validate"
"github.com/coreos/ignition/config/validate/report"
"github.com/coreos/ignition/internal/exec/stages"
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/disks/disks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
"os/exec"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/distro"
"github.com/coreos/ignition/internal/exec/stages"
"github.com/coreos/ignition/internal/exec/util"
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/disks/filesystems.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"runtime"
"strings"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/distro"
"github.com/coreos/ignition/internal/exec/util"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/disks/partitions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strconv"
"strings"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/exec/util"
"github.com/coreos/ignition/internal/sgdisk"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/disks/raid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"
"os/exec"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/distro"
"github.com/coreos/ignition/internal/exec/util"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/files/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"os"
"strings"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/distro"
"github.com/coreos/ignition/internal/exec/stages"
"github.com/coreos/ignition/internal/exec/util"
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/files/filesystemEntries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sort"

configUtil "github.com/coreos/ignition/config/util"
"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/exec/util"
"github.com/coreos/ignition/internal/log"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/files/passwd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package files
import (
"fmt"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
)

// createPasswd creates the users and groups as described in config.Passwd.
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/files/units.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package files
import (
"path/filepath"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/distro"
"github.com/coreos/ignition/internal/exec/util"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/mount/mount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"sort"
"syscall"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/exec/stages"
"github.com/coreos/ignition/internal/exec/util"
"github.com/coreos/ignition/internal/log"
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/stages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package stages

import (
"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/log"
"github.com/coreos/ignition/internal/registry"
"github.com/coreos/ignition/internal/resource"
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/stages/umount/umount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"sort"
"syscall"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/exec/stages"
"github.com/coreos/ignition/internal/exec/util"
"github.com/coreos/ignition/internal/log"
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/util/blkid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"unsafe"

"github.com/coreos/ignition/config/util"
"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/util/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strconv"
"syscall"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/log"
"github.com/coreos/ignition/internal/resource"
"github.com/coreos/ignition/internal/util"
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/util/passwd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strings"
"syscall"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/as_user"
"github.com/coreos/ignition/internal/distro"
"github.com/coreos/ignition/internal/log"
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/util/unit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"net/url"
"os"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/internal/distro"

"github.com/vincent-petithory/dataurl"
Expand Down
2 changes: 1 addition & 1 deletion internal/exec/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"io/ioutil"
"os"

config "github.com/coreos/ignition/config/v3_0_experimental"
config "github.com/coreos/ignition/config/v3_0"
"github.com/coreos/ignition/config/validate/report"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/providers/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package aws
import (
"net/url"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/config/validate/report"
"github.com/coreos/ignition/internal/log"
"github.com/coreos/ignition/internal/providers/util"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/azure/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"syscall"
"time"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/config/validate/report"
"github.com/coreos/ignition/internal/distro"
"github.com/coreos/ignition/internal/log"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/cloudstack/cloudstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"syscall"
"time"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/config/validate/report"
"github.com/coreos/ignition/internal/distro"
"github.com/coreos/ignition/internal/log"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/cmdline/cmdline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"net/url"
"strings"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/config/validate/report"
"github.com/coreos/ignition/internal/distro"
"github.com/coreos/ignition/internal/log"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/digitalocean/digitalocean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package digitalocean
import (
"net/url"

"github.com/coreos/ignition/config/v3_0_experimental/types"
"github.com/coreos/ignition/config/v3_0/types"
"github.com/coreos/ignition/config/validate/report"
"github.com/coreos/ignition/internal/providers/util"
"github.com/coreos/ignition/internal/resource"
Expand Down
Loading