Skip to content

Commit 47e9383

Browse files
authored
fix(import): output store and model information when including a store id (#336)
2 parents a2919b7 + 338b29c commit 47e9383

File tree

1 file changed

+31
-10
lines changed

1 file changed

+31
-10
lines changed

cmd/store/import.go

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package store
1818

1919
import (
20+
"context"
2021
"fmt"
2122
"os"
2223
"path"
@@ -44,21 +45,39 @@ func importStore(
4445
maxParallelRequests int,
4546
fileName string,
4647
) (*CreateStoreAndModelResponse, error) {
47-
var err error
48-
var response *CreateStoreAndModelResponse //nolint:wsl
49-
if storeID == "" { //nolint:wsl,nestif
48+
response := &CreateStoreAndModelResponse{}
49+
50+
if storeID == "" { //nolint:nestif
5051
storeDataName := storeData.Name
5152
if storeDataName == "" {
5253
storeDataName = strings.TrimSuffix(path.Base(fileName), ".fga.yaml")
5354
}
54-
createStoreAndModelResponse, err := CreateStoreWithModel(clientConfig, storeDataName, //nolint:wsl
55-
storeData.Model, format)
56-
response = createStoreAndModelResponse
57-
if err != nil { //nolint:wsl
55+
56+
createStoreAndModelResponse, err := CreateStoreWithModel(
57+
clientConfig,
58+
storeDataName,
59+
storeData.Model,
60+
format,
61+
)
62+
if err != nil {
5863
return nil, err
5964
}
60-
clientConfig.StoreID = createStoreAndModelResponse.Store.Id //nolint:wsl
65+
66+
response = createStoreAndModelResponse
67+
clientConfig.StoreID = createStoreAndModelResponse.Store.Id
6168
} else {
69+
store, err := fgaClient.GetStore(context.Background()).Execute()
70+
if err != nil {
71+
return nil, err //nolint:wrapcheck
72+
}
73+
74+
response.Store = client.ClientCreateStoreResponse{
75+
CreatedAt: store.GetCreatedAt(),
76+
Id: store.GetId(),
77+
Name: store.GetName(),
78+
UpdatedAt: store.GetUpdatedAt(),
79+
}
80+
6281
authModel := authorizationmodel.AuthzModel{}
6382
clientConfig.StoreID = storeID
6483

@@ -67,13 +86,15 @@ func importStore(
6786
return nil, err //nolint:wrapcheck
6887
}
6988

70-
_, err := model.Write(fgaClient, authModel)
89+
modelWriteRes, err := model.Write(fgaClient, authModel)
7190
if err != nil {
7291
return nil, fmt.Errorf("failed to write model due to %w", err)
7392
}
93+
94+
response.Model = modelWriteRes
7495
}
7596

76-
fgaClient, err = clientConfig.GetFgaClient()
97+
fgaClient, err := clientConfig.GetFgaClient()
7798
if err != nil {
7899
return nil, fmt.Errorf("failed to initialize FGA Client due to %w", err)
79100
}

0 commit comments

Comments
 (0)