Skip to content

Commit 6126fb6

Browse files
committed
fixup! Convert v1alpha1 Github projects to v1alpha2 Git projects
ignore error when reading attribute
1 parent 45b3cff commit 6126fb6

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

pkg/apis/workspaces/v1alpha1/projects_conversion.go

+2-10
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,7 @@ func convertProjectFrom_v1alpha2(src *v1alpha2.Project, dest *Project) error {
7777

7878
// Check if a Git-type project was originally a Github-type project in v1alpha1
7979
if src.Git != nil && src.Attributes != nil {
80-
var attrErr error
81-
convertedFrom := src.Attributes.Get(ConvertedFromAttribute, &attrErr)
82-
if attrErr != nil {
83-
return attrErr
84-
}
80+
convertedFrom := src.Attributes.GetString(ConvertedFromAttribute, nil)
8581
if convertedFrom == GitHubConversionFromAttributeValue {
8682
dest.Github = &GithubProjectSource{
8783
GitLikeProjectSource: dest.Git.GitLikeProjectSource,
@@ -153,11 +149,7 @@ func convertStarterProjectFrom_v1alpha2(src *v1alpha2.StarterProject, dest *Star
153149

154150
// Check if a Git-type project was originally a Github-type project in v1alpha1
155151
if src.Git != nil && src.Attributes != nil {
156-
var attrErr error
157-
convertedFrom := src.Attributes.Get(ConvertedFromAttribute, &attrErr)
158-
if attrErr != nil {
159-
return attrErr
160-
}
152+
convertedFrom := src.Attributes.GetString(ConvertedFromAttribute, nil)
161153
if convertedFrom == GitHubConversionFromAttributeValue {
162154
dest.Github = &GithubProjectSource{
163155
GitLikeProjectSource: dest.Git.GitLikeProjectSource,

0 commit comments

Comments
 (0)