Skip to content

Commit 8d426d6

Browse files
author
Cristian Vidmar
committed
fix: panic in CMA ops on entries without a client
1 parent f2ec27e commit 8d426d6

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ build:
1616
## Run tests
1717
test:
1818
go run ./main.go -exportfile ./test/test-space-export.json ./test/testapi
19-
go test ./...
19+
go test -count=1 ./...
2020

2121
race:
2222
go run ./main.go -exportfile ./test/test-space-export.json ./test/testapi
23-
go test -race ./...
23+
go test -race -count=1 ./...
2424

2525
cover:
2626
rm cover.out cover.html

erm/templates/contentful_vo_lib_contenttype.gotmpl

+18
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,9 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) UpsertEntry() (err error) {
494494
if vo == nil {
495495
return errors.New("UpsertEntry: Value Object is nil")
496496
}
497+
if vo.CC == nil {
498+
return errors.New("UpsertEntry: Value Object has nil Contentful client")
499+
}
497500
if vo.CC.clientMode != ClientModeCMA {
498501
return errors.New("UpsertEntry: Only available in ClientModeCMA")
499502
}
@@ -517,6 +520,9 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) PublishEntry() (err error) {
517520
if vo == nil {
518521
return errors.New("PublishEntry: Value Object is nil")
519522
}
523+
if vo.CC == nil {
524+
return errors.New("PublishEntry: Value Object has nil Contentful client")
525+
}
520526
if vo.CC.clientMode != ClientModeCMA {
521527
return errors.New("PublishEntry: Only available in ClientModeCMA")
522528
}
@@ -536,6 +542,12 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) PublishEntry() (err error) {
536542
return
537543
}
538544
func (vo *Cf{{ firstCap $contentType.Sys.ID }}) UnpublishEntry() (err error) {
545+
if vo == nil {
546+
return errors.New("UnpublishEntry: Value Object is nil")
547+
}
548+
if vo.CC == nil {
549+
return errors.New("UnpublishEntry: Value Object has nil Contentful client")
550+
}
539551
if vo.CC.clientMode != ClientModeCMA {
540552
return errors.New("UnpublishEntry: Only available in ClientModeCMA")
541553
}
@@ -558,6 +570,9 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) UpdateEntry() (err error) {
558570
if vo == nil {
559571
return errors.New("UpdateEntry: Value Object is nil")
560572
}
573+
if vo.CC == nil {
574+
return errors.New("UpdateEntry: Value Object has nil Contentful client")
575+
}
561576
if vo.CC.clientMode != ClientModeCMA {
562577
return errors.New("UpdateEntry: Only available in ClientModeCMA")
563578
}
@@ -593,6 +608,9 @@ func (vo *Cf{{ firstCap $contentType.Sys.ID }}) DeleteEntry() (err error) {
593608
if vo == nil {
594609
return errors.New("DeleteEntry: Value Object is nil")
595610
}
611+
if vo.CC == nil {
612+
return errors.New("DeleteEntry: Value Object has nil Contentful client")
613+
}
596614
if vo.CC.clientMode != ClientModeCMA {
597615
return errors.New("DeleteEntry: Only available in ClientModeCMA")
598616
}

0 commit comments

Comments
 (0)