feat: Support import export namespace data

build/testing/cli.go

@@ -457,10 +457,15 @@ segments:
     value: buzz
 `
 
-	expectedYAMLStreamOutput = `version: "1.3"
-namespace: default
+	expectedYAMLStreamOutput = `version: "1.4"
+namespace:
+  key: default
+  name: Default
+  description: Default namespace
 ---
-namespace: foo
+namespace:
+  key: foo
+  name: foo
 flags:
 - key: zUFtS7D0UyMeueYu
   name: UAoZRksg94r1iipa
@@ -491,7 +496,9 @@ segments:
     value: buzz
   match_type: ALL_MATCH_TYPE
 ---
-namespace: bar
+namespace:
+  key: bar
+  name: bar
 flags:
 - key: zUFtS7D0UyMeueYu
   name: UAoZRksg94r1iipa

build/testing/integration.go

@@ -14,6 +14,7 @@ import (
 	"math/big"
 	"os"
 	"path"
+	"runtime"
 	"strings"
 	"time"
 
@@ -46,7 +47,7 @@ func init() {
 var (
 	protocolPorts = map[string]int{"http": 8080, "grpc": 9000}
 	replacer      = strings.NewReplacer(" ", "-", "/", "-")
-	sema          = make(chan struct{}, 6)
+	sema          = make(chan struct{}, max(6, runtime.NumCPU()))
 
 	// AllCases are the top-level filterable integration test cases.
 	AllCases = map[string]testCaseFn{
@@ -627,11 +628,6 @@ func importExport(ctx context.Context, _ *dagger.Client, base, flipt *dagger.Con
 				return err
 			}
 
-			if ns == "default" {
-				// replace namespace in expected yaml
-				expected = strings.ReplaceAll(expected, "version: \"1.3\"\n", fmt.Sprintf("version: \"1.3\"\nnamespace: %s\n", ns))
-			}
-
 			if ns != "default" {
 				flags = append(flags, "--namespaces", ns)
 			}

build/testing/integration/readonly/testdata/main/default.yaml

@@ -1,4 +1,8 @@
-version: "1.3"
+version: "1.4"
+namespace:
+  key: default
+  name: Default
+  description: Default namespace
 flags:
 - key: flag_001
   name: FLAG_001

build/testing/integration/readonly/testdata/main/production.yaml

@@ -1,5 +1,7 @@
-version: "1.3"
-namespace: production
+version: "1.4"
+namespace:
+  key: production
+  name: Production
 flags:
 - key: flag_001
   name: FLAG_001

build/testing/testdata/flipt-namespace-foo.yml

@@ -1,30 +1,29 @@
-# exported by Flipt (dev) on 2020-02-24T14:57:19Z
 namespace: foo
 flags:
-- key: zUFtS7D0UyMeueYu
-  name: UAoZRksg94r1iipa
-  description: description
-  enabled: true
-  variants:
-  - key: NGxfcVffpMhBz9n8
-    name: fhDHQ7rcxvoaWbHw
-  - key: sDGD6NvfCRyaQUn3
-  rules:
-  - segment: 08UoVJ96LhZblPEx
-    rank: 1
-    distributions:
-    - variant: NGxfcVffpMhBz9n8
-      rollout: 100
+  - key: zUFtS7D0UyMeueYu
+    name: UAoZRksg94r1iipa
+    description: description
+    enabled: true
+    variants:
+      - key: NGxfcVffpMhBz9n8
+        name: fhDHQ7rcxvoaWbHw
+      - key: sDGD6NvfCRyaQUn3
+    rules:
+      - segment: 08UoVJ96LhZblPEx
+        rank: 1
+        distributions:
+          - variant: NGxfcVffpMhBz9n8
+            rollout: 100
 segments:
-- key: 08UoVJ96LhZblPEx
-  name: 2oS8SHbrxyFkRg1a
-  description: description
-  constraints:
-  - type: STRING_COMPARISON_TYPE
-    property: foo
-    operator: eq
-    value: baz
-  - type: STRING_COMPARISON_TYPE
-    property: fizz
-    operator: neq
-    value: buzz
+  - key: 08UoVJ96LhZblPEx
+    name: 2oS8SHbrxyFkRg1a
+    description: description
+    constraints:
+      - type: STRING_COMPARISON_TYPE
+        property: foo
+        operator: eq
+        value: baz
+      - type: STRING_COMPARISON_TYPE
+        property: fizz
+        operator: neq
+        value: buzz

build/testing/testdata/flipt-yaml-stream.yml

@@ -1,59 +1,59 @@
 namespace: foo
 flags:
-- key: zUFtS7D0UyMeueYu
-  name: UAoZRksg94r1iipa
-  description: description
-  enabled: true
-  variants:
-  - key: NGxfcVffpMhBz9n8
-    name: fhDHQ7rcxvoaWbHw
-  - key: sDGD6NvfCRyaQUn3
-  rules:
-  - segment: 08UoVJ96LhZblPEx
-    rank: 1
-    distributions:
-    - variant: NGxfcVffpMhBz9n8
-      rollout: 100
+  - key: zUFtS7D0UyMeueYu
+    name: UAoZRksg94r1iipa
+    description: description
+    enabled: true
+    variants:
+      - key: NGxfcVffpMhBz9n8
+        name: fhDHQ7rcxvoaWbHw
+      - key: sDGD6NvfCRyaQUn3
+    rules:
+      - segment: 08UoVJ96LhZblPEx
+        rank: 1
+        distributions:
+          - variant: NGxfcVffpMhBz9n8
+            rollout: 100
 segments:
-- key: 08UoVJ96LhZblPEx
-  name: 2oS8SHbrxyFkRg1a
-  description: description
-  constraints:
-  - type: STRING_COMPARISON_TYPE
-    property: foo
-    operator: eq
-    value: baz
-  - type: STRING_COMPARISON_TYPE
-    property: fizz
-    operator: neq
-    value: buzz
+  - key: 08UoVJ96LhZblPEx
+    name: 2oS8SHbrxyFkRg1a
+    description: description
+    constraints:
+      - type: STRING_COMPARISON_TYPE
+        property: foo
+        operator: eq
+        value: baz
+      - type: STRING_COMPARISON_TYPE
+        property: fizz
+        operator: neq
+        value: buzz
 ---
 namespace: bar
 flags:
-- key: zUFtS7D0UyMeueYu
-  name: UAoZRksg94r1iipa
-  description: description
-  enabled: true
-  variants:
-  - key: NGxfcVffpMhBz9n8
-    name: fhDHQ7rcxvoaWbHw
-  - key: sDGD6NvfCRyaQUn3
-  rules:
-  - segment: 08UoVJ96LhZblPEx
-    rank: 1
-    distributions:
-    - variant: NGxfcVffpMhBz9n8
-      rollout: 100
+  - key: zUFtS7D0UyMeueYu
+    name: UAoZRksg94r1iipa
+    description: description
+    enabled: true
+    variants:
+      - key: NGxfcVffpMhBz9n8
+        name: fhDHQ7rcxvoaWbHw
+      - key: sDGD6NvfCRyaQUn3
+    rules:
+      - segment: 08UoVJ96LhZblPEx
+        rank: 1
+        distributions:
+          - variant: NGxfcVffpMhBz9n8
+            rollout: 100
 segments:
-- key: 08UoVJ96LhZblPEx
-  name: 2oS8SHbrxyFkRg1a
-  description: description
-  constraints:
-  - type: STRING_COMPARISON_TYPE
-    property: foo
-    operator: eq
-    value: baz
-  - type: STRING_COMPARISON_TYPE
-    property: fizz
-    operator: neq
-    value: buzz
+  - key: 08UoVJ96LhZblPEx
+    name: 2oS8SHbrxyFkRg1a
+    description: description
+    constraints:
+      - type: STRING_COMPARISON_TYPE
+        property: foo
+        operator: eq
+        value: baz
+      - type: STRING_COMPARISON_TYPE
+        property: fizz
+        operator: neq
+        value: buzz

build/testing/testdata/flipt.yml

@@ -1,30 +1,28 @@
-# exported by Flipt (dev) on 2020-02-24T14:57:19Z
-
 flags:
-- key: zUFtS7D0UyMeueYu
-  name: UAoZRksg94r1iipa
-  description: description
-  enabled: true
-  variants:
-  - key: NGxfcVffpMhBz9n8
-    name: fhDHQ7rcxvoaWbHw
-  - key: sDGD6NvfCRyaQUn3
-  rules:
-  - segment: 08UoVJ96LhZblPEx
-    rank: 1
-    distributions:
-    - variant: NGxfcVffpMhBz9n8
-      rollout: 100
+  - key: zUFtS7D0UyMeueYu
+    name: UAoZRksg94r1iipa
+    description: description
+    enabled: true
+    variants:
+      - key: NGxfcVffpMhBz9n8
+        name: fhDHQ7rcxvoaWbHw
+      - key: sDGD6NvfCRyaQUn3
+    rules:
+      - segment: 08UoVJ96LhZblPEx
+        rank: 1
+        distributions:
+          - variant: NGxfcVffpMhBz9n8
+            rollout: 100
 segments:
-- key: 08UoVJ96LhZblPEx
-  name: 2oS8SHbrxyFkRg1a
-  description: description
-  constraints:
-  - type: STRING_COMPARISON_TYPE
-    property: foo
-    operator: eq
-    value: baz
-  - type: STRING_COMPARISON_TYPE
-    property: fizz
-    operator: neq
-    value: buzz
+  - key: 08UoVJ96LhZblPEx
+    name: 2oS8SHbrxyFkRg1a
+    description: description
+    constraints:
+      - type: STRING_COMPARISON_TYPE
+        property: foo
+        operator: eq
+        value: baz
+      - type: STRING_COMPARISON_TYPE
+        property: fizz
+        operator: neq
+        value: buzz

core/validation/extended.cue

@@ -1,4 +1,3 @@
 #Flag: {
 	description: =~"^.+$"
 }
-

core/validation/flipt.cue

@@ -1,23 +1,30 @@
-version:   "1.0" | "1.1" | "1.2" | *"1.3"
+version: "1.0" | "1.1" | "1.2" | "1.3" | *"1.4"
 
 close({
-	namespace: string & =~"^[-_,A-Za-z0-9]+$" | *"default"
+	version:    version
+	namespace?: #Namespace
 	flags: [...#Flag]
 	segments: [...#Segment]
 })
 
+#Namespace: {
+	key:          string & =~"^[-_,A-Za-z0-9]+$" | *"default"
+	name?:        string & =~"^.+$"
+	description?: string
+} | string & =~"^[-_,A-Za-z0-9]+$"
+
 #Flag: {
 	key:          string & =~"^[-_,A-Za-z0-9]+$"
 	name:         string & =~"^.+$"
 	description?: string
 	enabled:      bool | *false
 	variants: [...#Variant]
 	rules: [...#Rule]
-	if version == "1.1" || version == "1.2" || version == "1.3" {
+	if version == "1.1" || version == "1.2" || version == "1.3" || version == "1.4" {
 		type: "BOOLEAN_FLAG_TYPE" | *"VARIANT_FLAG_TYPE"
 		#FlagBoolean | *{}
 	}
-	if version == "1.3" {
+	if version == "1.3" || version == "1.4" {
 		metadata: [string]: (string | int | bool | float)
 	}
 }
@@ -34,8 +41,8 @@ close({
 	key:          string & =~"^.+$"
 	name?:        string & =~"^.+$"
 	description?: string
-	attachment:   {...} | [...] | *null
-	if version == "1.3" {
+	attachment: {...} | [...] | *null
+	if version == "1.3" || version == "1.4" {
 		default: bool | *false
 	}
 }

core/validation/testdata/valid.yaml

@@ -1,4 +1,7 @@
-namespace: default
+namespace:
+  key: foo
+  name: foo
+  description: foo namespace
 flags:
 - key: flipt
   name: flipt