Skip to content

Commit f2919bb

Browse files
Merge pull request meshery#410 from theBeginner86/theBeginner86/chore/12
[chore] Revert removal of application_configuration
2 parents 27fdf59 + b901b80 commit f2919bb

File tree

3 files changed

+50
-3
lines changed

3 files changed

+50
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ require (
211211
k8s.io/klog/v2 v2.100.1 // indirect
212212
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
213213
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
214-
oras.land/oras-go v1.2.4 // indirect
214+
oras.land/oras-go v1.2.3 // indirect
215215
sigs.k8s.io/controller-runtime v0.13.0 // indirect
216216
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
217217
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,8 +1408,8 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
14081408
k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
14091409
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
14101410
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1411-
oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=
1412-
oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324=
1411+
oras.land/oras-go v1.2.3 h1:v8PJl+gEAntI1pJ/LCrDgsuk+1PKVavVEPsYIHFE5uY=
1412+
oras.land/oras-go v1.2.3/go.mod h1:M/uaPdYklze0Vf3AakfarnpoEckvw0ESbRdN8Z1vdJg=
14131413
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
14141414
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
14151415
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package v1alpha1
2+
3+
import (
4+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
)
6+
7+
// Configuration is the structure for OAM Application Configuration
8+
type Configuration struct {
9+
metav1.TypeMeta `json:",inline"`
10+
metav1.ObjectMeta `json:"metadata,omitempty"`
11+
12+
Spec ConfigurationSpec `json:"spec,omitempty"`
13+
}
14+
15+
// ConfigurationSpec is the structure for the OAM Application
16+
// Configuration Spec
17+
type ConfigurationSpec struct {
18+
Components []ConfigurationSpecComponent
19+
}
20+
21+
// ConfigurationSpecComponent is the struct for OAM Application
22+
// Configuration's spec's components
23+
type ConfigurationSpecComponent struct {
24+
ComponentName string
25+
Traits []ConfigurationSpecComponentTrait
26+
Scopes []ConfigurationSpecComponentScope
27+
}
28+
29+
// ConfigurationSpecComponentTrait is the struct
30+
type ConfigurationSpecComponentTrait struct {
31+
Name string
32+
Properties map[string]interface{}
33+
}
34+
35+
// ConfigurationSpecComponentScope struct defines the structure
36+
// for scope of OAM application configuration's spec's component's scope
37+
type ConfigurationSpecComponentScope struct {
38+
ScopeRef ConfigurationSpecComponentScopeRef
39+
}
40+
41+
// ConfigurationSpecComponentScopeRef struct defines the structure for
42+
// scope of OAM application configuration's spec's component's scope's
43+
// scopeRef
44+
type ConfigurationSpecComponentScopeRef struct {
45+
metav1.TypeMeta `json:",inline"`
46+
Name string
47+
}

0 commit comments

Comments
 (0)