diff --git a/catalog/changesets/compat.go b/catalog/changesets/compat.go new file mode 100644 index 0000000..640f317 --- /dev/null +++ b/catalog/changesets/compat.go @@ -0,0 +1,64 @@ +// Deprecated: Use github.com/smartcontractkit/cld-changesets/datastore/changesets instead. +package changesets + +import datastore "github.com/smartcontractkit/cld-changesets/datastore/changesets" + +// Deprecated: Use datastore/changesets.CreateAddressRefChangeset. +type CreateAddressRefChangeset = datastore.CreateAddressRefChangeset + +// Deprecated: Use datastore/changesets.CreateAddressRefChangesetInput. +type CreateAddressRefChangesetInput = datastore.CreateAddressRefChangesetInput + +// Deprecated: Use datastore/changesets.CreateChainMetadataChangeset. +type CreateChainMetadataChangeset = datastore.CreateChainMetadataChangeset + +// Deprecated: Use datastore/changesets.CreateChainMetadataChangesetInput. +type CreateChainMetadataChangesetInput = datastore.CreateChainMetadataChangesetInput + +// Deprecated: Use datastore/changesets.CreateContractMetadataChangeset. +type CreateContractMetadataChangeset = datastore.CreateContractMetadataChangeset + +// Deprecated: Use datastore/changesets.CreateContractMetadataChangesetInput. +type CreateContractMetadataChangesetInput = datastore.CreateContractMetadataChangesetInput + +// Deprecated: Use datastore/changesets.DeleteAddressRefChangeset. +type DeleteAddressRefChangeset = datastore.DeleteAddressRefChangeset + +// Deprecated: Use datastore/changesets.DeleteAddressRefChangesetInput. +type DeleteAddressRefChangesetInput = datastore.DeleteAddressRefChangesetInput + +// Deprecated: Use datastore/changesets.DeleteChainMetadataChangeset. +type DeleteChainMetadataChangeset = datastore.DeleteChainMetadataChangeset + +// Deprecated: Use datastore/changesets.DeleteChainMetadataChangesetInput. +type DeleteChainMetadataChangesetInput = datastore.DeleteChainMetadataChangesetInput + +// Deprecated: Use datastore/changesets.DeleteContractMetadataChangeset. +type DeleteContractMetadataChangeset = datastore.DeleteContractMetadataChangeset + +// Deprecated: Use datastore/changesets.DeleteContractMetadataChangesetInput. +type DeleteContractMetadataChangesetInput = datastore.DeleteContractMetadataChangesetInput + +// Deprecated: Use datastore/changesets.UpdateAddressRefChangeset. +type UpdateAddressRefChangeset = datastore.UpdateAddressRefChangeset + +// Deprecated: Use datastore/changesets.UpdateAddressRefChangesetInput. +type UpdateAddressRefChangesetInput = datastore.UpdateAddressRefChangesetInput + +// Deprecated: Use datastore/changesets.UpdateChainMetadataChangeset. +type UpdateChainMetadataChangeset = datastore.UpdateChainMetadataChangeset + +// Deprecated: Use datastore/changesets.UpdateChainMetadataChangesetInput. +type UpdateChainMetadataChangesetInput = datastore.UpdateChainMetadataChangesetInput + +// Deprecated: Use datastore/changesets.UpdateContractMetadataChangeset. +type UpdateContractMetadataChangeset = datastore.UpdateContractMetadataChangeset + +// Deprecated: Use datastore/changesets.UpdateContractMetadataChangesetInput. +type UpdateContractMetadataChangesetInput = datastore.UpdateContractMetadataChangesetInput + +// Deprecated: Use datastore/changesets.UpdateEnvMetadataChangeset. +type UpdateEnvMetadataChangeset = datastore.UpdateEnvMetadataChangeset + +// Deprecated: Use datastore/changesets.UpdateEnvMetadataChangesetInput. +type UpdateEnvMetadataChangesetInput = datastore.UpdateEnvMetadataChangesetInput diff --git a/catalog/operations/compat.go b/catalog/operations/compat.go new file mode 100644 index 0000000..f6490fb --- /dev/null +++ b/catalog/operations/compat.go @@ -0,0 +1,124 @@ +// Deprecated: Use github.com/smartcontractkit/cld-changesets/datastore/operations instead. +package operations + +import datastore "github.com/smartcontractkit/cld-changesets/datastore/operations" + +// Deprecated: Use datastore/operations.CreateAddressRefDeps. +type CreateAddressRefDeps = datastore.CreateAddressRefDeps + +// Deprecated: Use datastore/operations.CreateAddressRefInput. +type CreateAddressRefInput = datastore.CreateAddressRefInput + +// Deprecated: Use datastore/operations.CreateAddressRefOutput. +type CreateAddressRefOutput = datastore.CreateAddressRefOutput + +// Deprecated: Use datastore/operations.CreateChainMetadataDeps. +type CreateChainMetadataDeps = datastore.CreateChainMetadataDeps + +// Deprecated: Use datastore/operations.CreateChainMetadataInput. +type CreateChainMetadataInput = datastore.CreateChainMetadataInput + +// Deprecated: Use datastore/operations.CreateChainMetadataOutput. +type CreateChainMetadataOutput = datastore.CreateChainMetadataOutput + +// Deprecated: Use datastore/operations.CreateContractMetadataDeps. +type CreateContractMetadataDeps = datastore.CreateContractMetadataDeps + +// Deprecated: Use datastore/operations.CreateContractMetadataInput. +type CreateContractMetadataInput = datastore.CreateContractMetadataInput + +// Deprecated: Use datastore/operations.CreateContractMetadataOutput. +type CreateContractMetadataOutput = datastore.CreateContractMetadataOutput + +// Deprecated: Use datastore/operations.DeleteAddressRefDeps. +type DeleteAddressRefDeps = datastore.DeleteAddressRefDeps + +// Deprecated: Use datastore/operations.DeleteAddressRefInput. +type DeleteAddressRefInput = datastore.DeleteAddressRefInput + +// Deprecated: Use datastore/operations.DeleteAddressRefOutput. +type DeleteAddressRefOutput = datastore.DeleteAddressRefOutput + +// Deprecated: Use datastore/operations.DeleteChainMetadataDeps. +type DeleteChainMetadataDeps = datastore.DeleteChainMetadataDeps + +// Deprecated: Use datastore/operations.DeleteChainMetadataInput. +type DeleteChainMetadataInput = datastore.DeleteChainMetadataInput + +// Deprecated: Use datastore/operations.DeleteChainMetadataOutput. +type DeleteChainMetadataOutput = datastore.DeleteChainMetadataOutput + +// Deprecated: Use datastore/operations.DeleteContractMetadataDeps. +type DeleteContractMetadataDeps = datastore.DeleteContractMetadataDeps + +// Deprecated: Use datastore/operations.DeleteContractMetadataInput. +type DeleteContractMetadataInput = datastore.DeleteContractMetadataInput + +// Deprecated: Use datastore/operations.DeleteContractMetadataOutput. +type DeleteContractMetadataOutput = datastore.DeleteContractMetadataOutput + +// Deprecated: Use datastore/operations.UpdateAddressRefDeps. +type UpdateAddressRefDeps = datastore.UpdateAddressRefDeps + +// Deprecated: Use datastore/operations.UpdateAddressRefInput. +type UpdateAddressRefInput = datastore.UpdateAddressRefInput + +// Deprecated: Use datastore/operations.UpdateAddressRefOutput. +type UpdateAddressRefOutput = datastore.UpdateAddressRefOutput + +// Deprecated: Use datastore/operations.UpdateChainMetadataDeps. +type UpdateChainMetadataDeps = datastore.UpdateChainMetadataDeps + +// Deprecated: Use datastore/operations.UpdateChainMetadataInput. +type UpdateChainMetadataInput = datastore.UpdateChainMetadataInput + +// Deprecated: Use datastore/operations.UpdateChainMetadataOutput. +type UpdateChainMetadataOutput = datastore.UpdateChainMetadataOutput + +// Deprecated: Use datastore/operations.UpdateContractMetadataDeps. +type UpdateContractMetadataDeps = datastore.UpdateContractMetadataDeps + +// Deprecated: Use datastore/operations.UpdateContractMetadataInput. +type UpdateContractMetadataInput = datastore.UpdateContractMetadataInput + +// Deprecated: Use datastore/operations.UpdateContractMetadataOutput. +type UpdateContractMetadataOutput = datastore.UpdateContractMetadataOutput + +// Deprecated: Use datastore/operations.UpdateEnvMetadataDeps. +type UpdateEnvMetadataDeps = datastore.UpdateEnvMetadataDeps + +// Deprecated: Use datastore/operations.UpdateEnvMetadataInput. +type UpdateEnvMetadataInput = datastore.UpdateEnvMetadataInput + +// Deprecated: Use datastore/operations.UpdateEnvMetadataOutput. +type UpdateEnvMetadataOutput = datastore.UpdateEnvMetadataOutput + +// Deprecated: Use datastore/operations.CreateAddressRefOp. +var CreateAddressRefOp = datastore.CreateAddressRefOp + +// Deprecated: Use datastore/operations.CreateChainMetadataOp. +var CreateChainMetadataOp = datastore.CreateChainMetadataOp + +// Deprecated: Use datastore/operations.CreateContractMetadataOp. +var CreateContractMetadataOp = datastore.CreateContractMetadataOp + +// Deprecated: Use datastore/operations.DeleteAddressRefOp. +var DeleteAddressRefOp = datastore.DeleteAddressRefOp + +// Deprecated: Use datastore/operations.DeleteChainMetadataOp. +var DeleteChainMetadataOp = datastore.DeleteChainMetadataOp + +// Deprecated: Use datastore/operations.DeleteContractMetadataOp. +var DeleteContractMetadataOp = datastore.DeleteContractMetadataOp + +// Deprecated: Use datastore/operations.UpdateAddressRefOp. +var UpdateAddressRefOp = datastore.UpdateAddressRefOp + +// Deprecated: Use datastore/operations.UpdateChainMetadataOp. +var UpdateChainMetadataOp = datastore.UpdateChainMetadataOp + +// Deprecated: Use datastore/operations.UpdateContractMetadataOp. +var UpdateContractMetadataOp = datastore.UpdateContractMetadataOp + +// Deprecated: Use datastore/operations.UpdateEnvMetadataOp. +var UpdateEnvMetadataOp = datastore.UpdateEnvMetadataOp diff --git a/catalog/changesets/create_address_ref.go b/datastore/changesets/create_address_ref.go similarity index 96% rename from catalog/changesets/create_address_ref.go rename to datastore/changesets/create_address_ref.go index 9bc39e2..a845af2 100644 --- a/catalog/changesets/create_address_ref.go +++ b/datastore/changesets/create_address_ref.go @@ -9,10 +9,10 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" cldfops "github.com/smartcontractkit/chainlink-deployments-framework/operations" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) -// CreateAddressRefChangeset creates address ref entries in the Catalog service. +// CreateAddressRefChangeset creates address ref entries in the Datastore. type CreateAddressRefChangeset struct{} type CreateAddressRefChangesetInput struct { @@ -50,7 +50,7 @@ func (CreateAddressRefChangeset) VerifyPreconditions(e cldf.Environment, input C return nil } -// Apply executes the changeset, adding the address refs to the Catalog service. +// Apply executes the changeset, adding the address refs to the Datastore. func (CreateAddressRefChangeset) Apply(e cldf.Environment, input CreateAddressRefChangesetInput) (cldf.ChangesetOutput, error) { deps := operations.CreateAddressRefDeps{DataStore: e.DataStore} opInput := operations.CreateAddressRefInput{AddressRefs: input.AddressRefs} diff --git a/catalog/changesets/create_address_ref_test.go b/datastore/changesets/create_address_ref_test.go similarity index 95% rename from catalog/changesets/create_address_ref_test.go rename to datastore/changesets/create_address_ref_test.go index 1f5726f..724d123 100644 --- a/catalog/changesets/create_address_ref_test.go +++ b/datastore/changesets/create_address_ref_test.go @@ -13,7 +13,7 @@ import ( cldfoperations "github.com/smartcontractkit/chainlink-deployments-framework/operations" cldflogger "github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) func TestCreateAddressRefChangeset_VerifyPreconditions(t *testing.T) { @@ -117,9 +117,9 @@ func TestCreateAddressRefChangeset_Apply(t *testing.T) { DataStore: testDataStoreWithAddressRefs(t, addressRef1, addressRef2), Reports: []cldfoperations.Report[any, any]{{ Def: cldfoperations.Definition{ - ID: "catalog-create-address-ref", + ID: "datastore-create-address-ref", Version: semver.MustParse("1.0.0"), - Description: "Add address ref entries to the Catalog service", + Description: "Add address ref entries to the Datastore", }, Input: operations.CreateAddressRefInput{ AddressRefs: []cldfdatastore.AddressRef{addressRef1, addressRef2}, @@ -139,7 +139,7 @@ func TestCreateAddressRefChangeset_Apply(t *testing.T) { input: CreateAddressRefChangesetInput{ AddressRefs: []cldfdatastore.AddressRef{addressRef1, addressRef2}, }, - wantErr: "failed to create address ref entry 1 in catalog store: " + + wantErr: "failed to create address ref entry 1 in datastore: " + "an address ref with the supplied key already exists", }, } diff --git a/catalog/changesets/create_chain_metadata.go b/datastore/changesets/create_chain_metadata.go similarity index 95% rename from catalog/changesets/create_chain_metadata.go rename to datastore/changesets/create_chain_metadata.go index 2f8e603..cca563d 100644 --- a/catalog/changesets/create_chain_metadata.go +++ b/datastore/changesets/create_chain_metadata.go @@ -9,10 +9,10 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" cldfops "github.com/smartcontractkit/chainlink-deployments-framework/operations" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) -// CreateChainMetadataChangeset creates chain metadata entries in the Catalog service. +// CreateChainMetadataChangeset creates chain metadata entries in the Datastore. type CreateChainMetadataChangeset struct{} type CreateChainMetadataChangesetInput struct { @@ -50,7 +50,7 @@ func (CreateChainMetadataChangeset) VerifyPreconditions(e cldf.Environment, inpu return nil } -// Apply executes the changeset, adding the chain metadata to the Catalog service. +// Apply executes the changeset, adding the chain metadata to the Datastore. func (CreateChainMetadataChangeset) Apply(e cldf.Environment, input CreateChainMetadataChangesetInput) (cldf.ChangesetOutput, error) { deps := operations.CreateChainMetadataDeps{DataStore: e.DataStore} opInput := operations.CreateChainMetadataInput{ChainMetadata: input.ChainMetadata} diff --git a/catalog/changesets/create_chain_metadata_test.go b/datastore/changesets/create_chain_metadata_test.go similarity index 95% rename from catalog/changesets/create_chain_metadata_test.go rename to datastore/changesets/create_chain_metadata_test.go index 875a695..0dbe319 100644 --- a/catalog/changesets/create_chain_metadata_test.go +++ b/datastore/changesets/create_chain_metadata_test.go @@ -13,7 +13,7 @@ import ( cldfoperations "github.com/smartcontractkit/chainlink-deployments-framework/operations" cldflogger "github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) func TestCreateChainMetadataChangeset_VerifyPreconditions(t *testing.T) { @@ -115,9 +115,9 @@ func TestCreateChainMetadataChangeset_Apply(t *testing.T) { DataStore: testDataStoreWithChainMetadata(t, chainMetadata1, chainMetadata2), Reports: []cldfoperations.Report[any, any]{{ Def: cldfoperations.Definition{ - ID: "catalog-create-chain-metadata", + ID: "datastore-create-chain-metadata", Version: semver.MustParse("1.0.0"), - Description: "Add chain metadata entries to the Catalog service", + Description: "Add chain metadata entries to the Datastore", }, Input: operations.CreateChainMetadataInput{ ChainMetadata: []cldfdatastore.ChainMetadata{chainMetadata1, chainMetadata2}, @@ -137,7 +137,7 @@ func TestCreateChainMetadataChangeset_Apply(t *testing.T) { input: CreateChainMetadataChangesetInput{ ChainMetadata: []cldfdatastore.ChainMetadata{chainMetadata1, chainMetadata2}, }, - wantErr: "failed to create chain metadata entry 1 in catalog store: " + + wantErr: "failed to create chain metadata entry 1 in datastore: " + "a chain metadata record with the supplied key already exists", }, } diff --git a/catalog/changesets/create_contract_metadata.go b/datastore/changesets/create_contract_metadata.go similarity index 95% rename from catalog/changesets/create_contract_metadata.go rename to datastore/changesets/create_contract_metadata.go index 699708d..5a70250 100644 --- a/catalog/changesets/create_contract_metadata.go +++ b/datastore/changesets/create_contract_metadata.go @@ -9,10 +9,10 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" cldfops "github.com/smartcontractkit/chainlink-deployments-framework/operations" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) -// CreateContractMetadataChangeset creates contract metadata entries in the Catalog service. +// CreateContractMetadataChangeset creates contract metadata entries in the Datastore. type CreateContractMetadataChangeset struct{} type CreateContractMetadataChangesetInput struct { @@ -50,7 +50,7 @@ func (CreateContractMetadataChangeset) VerifyPreconditions(e cldf.Environment, i return nil } -// Apply executes the changeset, adding the contract metadata to the Catalog service. +// Apply executes the changeset, adding the contract metadata to the Datastore. func (CreateContractMetadataChangeset) Apply(e cldf.Environment, input CreateContractMetadataChangesetInput) (cldf.ChangesetOutput, error) { deps := operations.CreateContractMetadataDeps{DataStore: e.DataStore} opInput := operations.CreateContractMetadataInput{ContractMetadata: input.ContractMetadata} diff --git a/catalog/changesets/create_contract_metadata_test.go b/datastore/changesets/create_contract_metadata_test.go similarity index 95% rename from catalog/changesets/create_contract_metadata_test.go rename to datastore/changesets/create_contract_metadata_test.go index 57201e4..30882dd 100644 --- a/catalog/changesets/create_contract_metadata_test.go +++ b/datastore/changesets/create_contract_metadata_test.go @@ -13,7 +13,7 @@ import ( cldfoperations "github.com/smartcontractkit/chainlink-deployments-framework/operations" cldflogger "github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) func TestCreateContractMetadataChangeset_VerifyPreconditions(t *testing.T) { @@ -115,9 +115,9 @@ func TestCreateContractMetadataChangeset_Apply(t *testing.T) { DataStore: testDataStoreWithContractMetadata(t, contractMetadata1, contractMetadata2), Reports: []cldfoperations.Report[any, any]{{ Def: cldfoperations.Definition{ - ID: "catalog-create-contract-metadata", + ID: "datastore-create-contract-metadata", Version: semver.MustParse("1.0.0"), - Description: "Add contract metadata entries to the Catalog service", + Description: "Add contract metadata entries to the Datastore", }, Input: operations.CreateContractMetadataInput{ ContractMetadata: []cldfdatastore.ContractMetadata{contractMetadata1, contractMetadata2}, @@ -137,7 +137,7 @@ func TestCreateContractMetadataChangeset_Apply(t *testing.T) { input: CreateContractMetadataChangesetInput{ ContractMetadata: []cldfdatastore.ContractMetadata{contractMetadata1, contractMetadata2}, }, - wantErr: "failed to create contract metadata entry 1 in catalog store: " + + wantErr: "failed to create contract metadata entry 1 in datastore: " + "a contract metadata record with the supplied key already exists", }, } diff --git a/catalog/changesets/delete_address_ref.go b/datastore/changesets/delete_address_ref.go similarity index 93% rename from catalog/changesets/delete_address_ref.go rename to datastore/changesets/delete_address_ref.go index f8f09c0..1d2f549 100644 --- a/catalog/changesets/delete_address_ref.go +++ b/datastore/changesets/delete_address_ref.go @@ -8,10 +8,10 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" cldfops "github.com/smartcontractkit/chainlink-deployments-framework/operations" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) -// DeleteAddressRefChangeset deletes address ref entries from the Catalog service. +// DeleteAddressRefChangeset deletes address ref entries from the Datastore. type DeleteAddressRefChangeset struct{} type DeleteAddressRefChangesetInput struct { @@ -43,7 +43,7 @@ func (DeleteAddressRefChangeset) VerifyPreconditions(e cldf.Environment, input D return nil } -// Apply executes the changeset, staging the address refs to be deleted from the Catalog service of local datastore files. +// Apply executes the changeset, staging the address refs to be deleted from the Datastore. func (DeleteAddressRefChangeset) Apply(e cldf.Environment, input DeleteAddressRefChangesetInput) (cldf.ChangesetOutput, error) { deps := operations.DeleteAddressRefDeps{DataStore: e.DataStore} opInput := operations.DeleteAddressRefInput{AddressRefKeys: input.AddressRefKeys} diff --git a/catalog/changesets/detele_address_ref_test.go b/datastore/changesets/delete_address_ref_test.go similarity index 100% rename from catalog/changesets/detele_address_ref_test.go rename to datastore/changesets/delete_address_ref_test.go diff --git a/catalog/changesets/delete_chain_metadata.go b/datastore/changesets/delete_chain_metadata.go similarity index 92% rename from catalog/changesets/delete_chain_metadata.go rename to datastore/changesets/delete_chain_metadata.go index c148d45..81780b8 100644 --- a/catalog/changesets/delete_chain_metadata.go +++ b/datastore/changesets/delete_chain_metadata.go @@ -8,10 +8,10 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" cldfops "github.com/smartcontractkit/chainlink-deployments-framework/operations" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) -// DeleteChainMetadataChangeset deletes chain metadata entries from the Catalog service. +// DeleteChainMetadataChangeset deletes chain metadata entries from the Datastore. type DeleteChainMetadataChangeset struct{} type DeleteChainMetadataChangesetInput struct { @@ -41,7 +41,7 @@ func (DeleteChainMetadataChangeset) VerifyPreconditions(e cldf.Environment, inpu return nil } -// Apply executes the changeset, staging the chain metadata entries to be deleted from the Catalog service or local datastore files. +// Apply executes the changeset, staging the chain metadata entries to be deleted from the Datastore. func (DeleteChainMetadataChangeset) Apply(e cldf.Environment, input DeleteChainMetadataChangesetInput) (cldf.ChangesetOutput, error) { deps := operations.DeleteChainMetadataDeps{DataStore: e.DataStore} opInput := operations.DeleteChainMetadataInput{ChainMetadataKeys: input.ChainMetadataKeys} diff --git a/catalog/changesets/delete_chain_metadata_test.go b/datastore/changesets/delete_chain_metadata_test.go similarity index 100% rename from catalog/changesets/delete_chain_metadata_test.go rename to datastore/changesets/delete_chain_metadata_test.go diff --git a/catalog/changesets/delete_contract_metadata.go b/datastore/changesets/delete_contract_metadata.go similarity index 92% rename from catalog/changesets/delete_contract_metadata.go rename to datastore/changesets/delete_contract_metadata.go index 7955268..0758fa6 100644 --- a/catalog/changesets/delete_contract_metadata.go +++ b/datastore/changesets/delete_contract_metadata.go @@ -8,10 +8,10 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" cldfops "github.com/smartcontractkit/chainlink-deployments-framework/operations" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) -// DeleteContractMetadataChangeset deletes contract metadata entries from the Catalog service. +// DeleteContractMetadataChangeset deletes contract metadata entries from the Datastore. type DeleteContractMetadataChangeset struct{} type DeleteContractMetadataChangesetInput struct { @@ -43,7 +43,7 @@ func (DeleteContractMetadataChangeset) VerifyPreconditions(e cldf.Environment, i return nil } -// Apply executes the changeset, staging the contract metadata entries to be deleted from the Catalog service or local datastore files. +// Apply executes the changeset, staging the contract metadata entries to be deleted from the Datastore. func (DeleteContractMetadataChangeset) Apply(e cldf.Environment, input DeleteContractMetadataChangesetInput) (cldf.ChangesetOutput, error) { deps := operations.DeleteContractMetadataDeps{DataStore: e.DataStore} opInput := operations.DeleteContractMetadataInput{ContractMetadataKeys: input.ContractMetadataKeys} diff --git a/catalog/changesets/delete_contract_metadata_test.go b/datastore/changesets/delete_contract_metadata_test.go similarity index 100% rename from catalog/changesets/delete_contract_metadata_test.go rename to datastore/changesets/delete_contract_metadata_test.go diff --git a/catalog/changesets/update_address_ref.go b/datastore/changesets/update_address_ref.go similarity index 95% rename from catalog/changesets/update_address_ref.go rename to datastore/changesets/update_address_ref.go index 18b49f5..0f2caed 100644 --- a/catalog/changesets/update_address_ref.go +++ b/datastore/changesets/update_address_ref.go @@ -9,10 +9,10 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" cldfops "github.com/smartcontractkit/chainlink-deployments-framework/operations" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) -// UpdateAddressRefChangeset updates existing address ref entries in the Catalog service. +// UpdateAddressRefChangeset updates existing address ref entries in the Datastore. type UpdateAddressRefChangeset struct{} type UpdateAddressRefChangesetInput struct { @@ -50,7 +50,7 @@ func (UpdateAddressRefChangeset) VerifyPreconditions(e cldf.Environment, input U return nil } -// Apply executes the changeset, updating the address refs in the Catalog service. +// Apply executes the changeset, updating the address refs in the Datastore. func (UpdateAddressRefChangeset) Apply( e cldf.Environment, input UpdateAddressRefChangesetInput, ) (cldf.ChangesetOutput, error) { diff --git a/catalog/changesets/update_address_ref_test.go b/datastore/changesets/update_address_ref_test.go similarity index 95% rename from catalog/changesets/update_address_ref_test.go rename to datastore/changesets/update_address_ref_test.go index 331668c..4745e8b 100644 --- a/catalog/changesets/update_address_ref_test.go +++ b/datastore/changesets/update_address_ref_test.go @@ -13,7 +13,7 @@ import ( cldfoperations "github.com/smartcontractkit/chainlink-deployments-framework/operations" cldflogger "github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) func TestUpdateAddressRefChangeset_VerifyPreconditions(t *testing.T) { @@ -119,9 +119,9 @@ func TestUpdateAddressRefChangeset_Apply(t *testing.T) { DataStore: testDataStoreWithAddressRefs(t, addressRef1Updated, addressRef2Updated), Reports: []cldfoperations.Report[any, any]{{ Def: cldfoperations.Definition{ - ID: "catalog-update-address-ref", + ID: "datastore-update-address-ref", Version: semver.MustParse("1.0.0"), - Description: "Update address ref entries in the Catalog service", + Description: "Update address ref entries in the Datastore", }, Input: operations.UpdateAddressRefInput{ AddressRefs: []cldfdatastore.AddressRef{addressRef1Updated, addressRef2Updated}, @@ -141,7 +141,7 @@ func TestUpdateAddressRefChangeset_Apply(t *testing.T) { input: UpdateAddressRefChangesetInput{ AddressRefs: []cldfdatastore.AddressRef{addressRef1Updated}, }, - wantErr: "failed to update address ref entry 0 in catalog store: " + + wantErr: "failed to update address ref entry 0 in datastore: " + "no such address ref can be found for the provided key", }, } diff --git a/catalog/changesets/update_chain_metadata.go b/datastore/changesets/update_chain_metadata.go similarity index 95% rename from catalog/changesets/update_chain_metadata.go rename to datastore/changesets/update_chain_metadata.go index 3150468..dd8beae 100644 --- a/catalog/changesets/update_chain_metadata.go +++ b/datastore/changesets/update_chain_metadata.go @@ -9,10 +9,10 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" cldfops "github.com/smartcontractkit/chainlink-deployments-framework/operations" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) -// UpdateChainMetadataChangeset updates existing chain metadata entries in the Catalog service. +// UpdateChainMetadataChangeset updates existing chain metadata entries in the Datastore. type UpdateChainMetadataChangeset struct{} type UpdateChainMetadataChangesetInput struct { @@ -48,7 +48,7 @@ func (UpdateChainMetadataChangeset) VerifyPreconditions(e cldf.Environment, inpu return nil } -// Apply executes the changeset, updating the chain metadata in the Catalog service. +// Apply executes the changeset, updating the chain metadata in the Datastore. func (UpdateChainMetadataChangeset) Apply( e cldf.Environment, input UpdateChainMetadataChangesetInput, ) (cldf.ChangesetOutput, error) { diff --git a/catalog/changesets/update_chain_metadata_test.go b/datastore/changesets/update_chain_metadata_test.go similarity index 95% rename from catalog/changesets/update_chain_metadata_test.go rename to datastore/changesets/update_chain_metadata_test.go index 7b214c9..5b089fa 100644 --- a/catalog/changesets/update_chain_metadata_test.go +++ b/datastore/changesets/update_chain_metadata_test.go @@ -13,7 +13,7 @@ import ( cldfoperations "github.com/smartcontractkit/chainlink-deployments-framework/operations" cldflogger "github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) func TestUpdateChainMetadataChangeset_VerifyPreconditions(t *testing.T) { @@ -117,9 +117,9 @@ func TestUpdateChainMetadataChangeset_Apply(t *testing.T) { DataStore: testDataStoreWithChainMetadata(t, chainMetadata1Updated, chainMetadata2Updated), Reports: []cldfoperations.Report[any, any]{{ Def: cldfoperations.Definition{ - ID: "catalog-update-chain-metadata", + ID: "datastore-update-chain-metadata", Version: semver.MustParse("1.0.0"), - Description: "Update chain metadata entries in the Catalog service", + Description: "Update chain metadata entries in the Datastore", }, Input: operations.UpdateChainMetadataInput{ ChainMetadata: []cldfdatastore.ChainMetadata{chainMetadata1Updated, chainMetadata2Updated}, @@ -139,7 +139,7 @@ func TestUpdateChainMetadataChangeset_Apply(t *testing.T) { input: UpdateChainMetadataChangesetInput{ ChainMetadata: []cldfdatastore.ChainMetadata{chainMetadata1Updated, chainMetadata2Updated}, }, - wantErr: "failed to update chain metadata entry 1 in catalog store: " + + wantErr: "failed to update chain metadata entry 1 in datastore: " + "no chain metadata record can be found for the provided key", }, } diff --git a/catalog/changesets/update_contract_metadata.go b/datastore/changesets/update_contract_metadata.go similarity index 95% rename from catalog/changesets/update_contract_metadata.go rename to datastore/changesets/update_contract_metadata.go index 3301b9d..f8b60b3 100644 --- a/catalog/changesets/update_contract_metadata.go +++ b/datastore/changesets/update_contract_metadata.go @@ -9,10 +9,10 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" cldfops "github.com/smartcontractkit/chainlink-deployments-framework/operations" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) -// UpdateContractMetadataChangeset updates existing contract metadata entries in the Catalog service. +// UpdateContractMetadataChangeset updates existing contract metadata entries in the Datastore. type UpdateContractMetadataChangeset struct{} type UpdateContractMetadataChangesetInput struct { @@ -50,7 +50,7 @@ func (UpdateContractMetadataChangeset) VerifyPreconditions(e cldf.Environment, i return nil } -// Apply executes the changeset, updating the contract metadata in the Catalog service. +// Apply executes the changeset, updating the contract metadata in the Datastore. func (UpdateContractMetadataChangeset) Apply( e cldf.Environment, input UpdateContractMetadataChangesetInput, ) (cldf.ChangesetOutput, error) { diff --git a/catalog/changesets/update_contract_metadata_test.go b/datastore/changesets/update_contract_metadata_test.go similarity index 95% rename from catalog/changesets/update_contract_metadata_test.go rename to datastore/changesets/update_contract_metadata_test.go index ba19f14..008e68c 100644 --- a/catalog/changesets/update_contract_metadata_test.go +++ b/datastore/changesets/update_contract_metadata_test.go @@ -13,7 +13,7 @@ import ( cldfoperations "github.com/smartcontractkit/chainlink-deployments-framework/operations" cldflogger "github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) func TestUpdateContractMetadataChangeset_VerifyPreconditions(t *testing.T) { @@ -117,9 +117,9 @@ func TestUpdateContractMetadataChangeset_Apply(t *testing.T) { DataStore: testDataStoreWithContractMetadata(t, contractMetadata1Updated, contractMetadata2Updated), Reports: []cldfoperations.Report[any, any]{{ Def: cldfoperations.Definition{ - ID: "catalog-update-contract-metadata", + ID: "datastore-update-contract-metadata", Version: semver.MustParse("1.0.0"), - Description: "Update contract metadata entries in the Catalog service", + Description: "Update contract metadata entries in the Datastore", }, Input: operations.UpdateContractMetadataInput{ ContractMetadata: []cldfdatastore.ContractMetadata{contractMetadata1Updated, contractMetadata2Updated}, @@ -139,7 +139,7 @@ func TestUpdateContractMetadataChangeset_Apply(t *testing.T) { input: UpdateContractMetadataChangesetInput{ ContractMetadata: []cldfdatastore.ContractMetadata{contractMetadata1Updated, contractMetadata2Updated}, }, - wantErr: "failed to update contract metadata entry 1 in catalog store: " + + wantErr: "failed to update contract metadata entry 1 in datastore: " + "no contract metadata record can be found for the provided key", }, } diff --git a/catalog/changesets/update_env_metadata.go b/datastore/changesets/update_env_metadata.go similarity index 93% rename from catalog/changesets/update_env_metadata.go rename to datastore/changesets/update_env_metadata.go index e792f22..801a237 100644 --- a/catalog/changesets/update_env_metadata.go +++ b/datastore/changesets/update_env_metadata.go @@ -7,10 +7,10 @@ import ( cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment" cldfops "github.com/smartcontractkit/chainlink-deployments-framework/operations" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) -// UpdateEnvMetadataChangeset updates existing env metadata entries in the Catalog service. +// UpdateEnvMetadataChangeset updates existing env metadata entries in the Datastore. type UpdateEnvMetadataChangeset struct{} type UpdateEnvMetadataChangesetInput struct { @@ -29,7 +29,7 @@ func (UpdateEnvMetadataChangeset) VerifyPreconditions(e cldf.Environment, input return nil } -// Apply executes the changeset, updating the env metadata in the Catalog service. +// Apply executes the changeset, updating the env metadata in the Datastore. func (UpdateEnvMetadataChangeset) Apply( e cldf.Environment, input UpdateEnvMetadataChangesetInput, ) (cldf.ChangesetOutput, error) { diff --git a/catalog/changesets/update_env_metadata_test.go b/datastore/changesets/update_env_metadata_test.go similarity index 95% rename from catalog/changesets/update_env_metadata_test.go rename to datastore/changesets/update_env_metadata_test.go index b80a0d4..7743f2a 100644 --- a/catalog/changesets/update_env_metadata_test.go +++ b/datastore/changesets/update_env_metadata_test.go @@ -13,7 +13,7 @@ import ( cldfoperations "github.com/smartcontractkit/chainlink-deployments-framework/operations" cldflogger "github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger" - "github.com/smartcontractkit/cld-changesets/catalog/operations" + "github.com/smartcontractkit/cld-changesets/datastore/operations" ) func TestUpdateEnvMetadataChangeset_VerifyPreconditions(t *testing.T) { @@ -98,9 +98,9 @@ func TestUpdateEnvMetadataChangeset_Apply(t *testing.T) { DataStore: testDataStoreWithEnvMetadata(t, envMetadataUpdated), Reports: []cldfoperations.Report[any, any]{{ Def: cldfoperations.Definition{ - ID: "catalog-update-env-metadata", + ID: "datastore-update-env-metadata", Version: semver.MustParse("1.0.0"), - Description: "Update env metadata entries in the Catalog service", + Description: "Update env metadata entries in the Datastore", }, Input: operations.UpdateEnvMetadataInput{ EnvMetadata: envMetadataUpdated, diff --git a/catalog/operations/create_address_ref.go b/datastore/operations/create_address_ref.go similarity index 83% rename from catalog/operations/create_address_ref.go rename to datastore/operations/create_address_ref.go index eff947a..75ce77b 100644 --- a/catalog/operations/create_address_ref.go +++ b/datastore/operations/create_address_ref.go @@ -25,11 +25,11 @@ type CreateAddressRefOutput struct { DataStore cldfdatastore.MutableDataStore } -// CreateAddressRefOp creates address ref entries in the Catalog service. +// CreateAddressRefOp creates address ref entries in the Datastore. var CreateAddressRefOp = cldfops.NewOperation( - "catalog-create-address-ref", + "datastore-create-address-ref", semver.MustParse("1.0.0"), - "Add address ref entries to the Catalog service", + "Add address ref entries to the Datastore", func(b cldfops.Bundle, deps CreateAddressRefDeps, input CreateAddressRefInput) (CreateAddressRefOutput, error) { dataStore := cldfdatastore.NewMemoryDataStore() err := dataStore.Merge(deps.DataStore) @@ -40,11 +40,11 @@ var CreateAddressRefOp = cldfops.NewOperation( for i, item := range input.AddressRefs { err = dataStore.Addresses().Add(item) if err != nil { - return CreateAddressRefOutput{}, fmt.Errorf("failed to create address ref entry %d in catalog store: %w", i, err) + return CreateAddressRefOutput{}, fmt.Errorf("failed to create address ref entry %d in datastore: %w", i, err) } } - b.Logger.Infow("Catalog AddressRef created successfully") + b.Logger.Infow("Datastore AddressRef created successfully") return CreateAddressRefOutput{DataStore: dataStore}, nil }, diff --git a/catalog/operations/create_chain_metadata.go b/datastore/operations/create_chain_metadata.go similarity index 83% rename from catalog/operations/create_chain_metadata.go rename to datastore/operations/create_chain_metadata.go index 6f58238..16afc7b 100644 --- a/catalog/operations/create_chain_metadata.go +++ b/datastore/operations/create_chain_metadata.go @@ -25,11 +25,11 @@ type CreateChainMetadataOutput struct { DataStore cldfdatastore.MutableDataStore } -// CreateChainMetadataOp creates chain metadata entries in the Catalog service. +// CreateChainMetadataOp creates chain metadata entries in the Datastore. var CreateChainMetadataOp = cldfops.NewOperation( - "catalog-create-chain-metadata", + "datastore-create-chain-metadata", semver.MustParse("1.0.0"), - "Add chain metadata entries to the Catalog service", + "Add chain metadata entries to the Datastore", func(b cldfops.Bundle, deps CreateChainMetadataDeps, input CreateChainMetadataInput) (CreateChainMetadataOutput, error) { dataStore := cldfdatastore.NewMemoryDataStore() err := dataStore.Merge(deps.DataStore) @@ -40,11 +40,11 @@ var CreateChainMetadataOp = cldfops.NewOperation( for i, item := range input.ChainMetadata { err = dataStore.ChainMetadata().Add(item) if err != nil { - return CreateChainMetadataOutput{}, fmt.Errorf("failed to create chain metadata entry %d in catalog store: %w", i, err) + return CreateChainMetadataOutput{}, fmt.Errorf("failed to create chain metadata entry %d in datastore: %w", i, err) } } - b.Logger.Infow("Catalog ChainMetadata created successfully") + b.Logger.Infow("Datastore ChainMetadata created successfully") return CreateChainMetadataOutput{DataStore: dataStore}, nil }, diff --git a/catalog/operations/create_contract_metadata.go b/datastore/operations/create_contract_metadata.go similarity index 86% rename from catalog/operations/create_contract_metadata.go rename to datastore/operations/create_contract_metadata.go index c5f2a16..3924ca5 100644 --- a/catalog/operations/create_contract_metadata.go +++ b/datastore/operations/create_contract_metadata.go @@ -25,11 +25,11 @@ type CreateContractMetadataOutput struct { DataStore cldfdatastore.MutableDataStore } -// CreateContractMetadataOp creates contract metadata entries in the Catalog service. +// CreateContractMetadataOp creates contract metadata entries in the Datastore. var CreateContractMetadataOp = cldfops.NewOperation( - "catalog-create-contract-metadata", + "datastore-create-contract-metadata", semver.MustParse("1.0.0"), - "Add contract metadata entries to the Catalog service", + "Add contract metadata entries to the Datastore", func(b cldfops.Bundle, deps CreateContractMetadataDeps, input CreateContractMetadataInput) (CreateContractMetadataOutput, error) { dataStore := cldfdatastore.NewMemoryDataStore() err := dataStore.Merge(deps.DataStore) @@ -40,11 +40,11 @@ var CreateContractMetadataOp = cldfops.NewOperation( for i, item := range input.ContractMetadata { err = dataStore.ContractMetadata().Add(item) if err != nil { - return CreateContractMetadataOutput{}, fmt.Errorf("failed to create contract metadata entry %d in catalog store: %w", i, err) + return CreateContractMetadataOutput{}, fmt.Errorf("failed to create contract metadata entry %d in datastore: %w", i, err) } } - b.Logger.Infow("Catalog ContractMetadata created successfully") + b.Logger.Infow("Datastore ContractMetadata created successfully") return CreateContractMetadataOutput{DataStore: dataStore}, nil }, diff --git a/catalog/operations/delete_address_ref.go b/datastore/operations/delete_address_ref.go similarity index 85% rename from catalog/operations/delete_address_ref.go rename to datastore/operations/delete_address_ref.go index 3318fc7..4b0d2da 100644 --- a/catalog/operations/delete_address_ref.go +++ b/datastore/operations/delete_address_ref.go @@ -23,11 +23,11 @@ type DeleteAddressRefOutput struct { DataStore cldfdatastore.MutableDataStore } -// DeleteAddressRefOp deletes address ref entries from the Catalog service or local datastore files. +// DeleteAddressRefOp deletes address ref entries from the Datastore. var DeleteAddressRefOp = cldfops.NewOperation( "datastore-delete-address-ref", semver.MustParse("1.0.0"), - "Delete address ref entries from the Catalog service or local datastore files", + "Delete address ref entries from the Datastore", func(b cldfops.Bundle, deps DeleteAddressRefDeps, input DeleteAddressRefInput) (DeleteAddressRefOutput, error) { dataStore := cldfdatastore.NewMemoryDataStore() err := dataStore.Merge(deps.DataStore) @@ -42,7 +42,7 @@ var DeleteAddressRefOp = cldfops.NewOperation( } } - b.Logger.Infow("Catalog AddressRef successfully staged for deletion") + b.Logger.Infow("Datastore AddressRef successfully staged for deletion") return DeleteAddressRefOutput{DataStore: dataStore}, nil }, diff --git a/catalog/operations/delete_chain_metadata.go b/datastore/operations/delete_chain_metadata.go similarity index 88% rename from catalog/operations/delete_chain_metadata.go rename to datastore/operations/delete_chain_metadata.go index b6740b2..2f20bcd 100644 --- a/catalog/operations/delete_chain_metadata.go +++ b/datastore/operations/delete_chain_metadata.go @@ -23,11 +23,11 @@ type DeleteChainMetadataOutput struct { DataStore cldfdatastore.MutableDataStore } -// DeleteChainMetadataOp deletes chain metadata entries from the Catalog service or local datastore files. +// DeleteChainMetadataOp deletes chain metadata entries from the Datastore. var DeleteChainMetadataOp = cldfops.NewOperation( "datastore-delete-chain-metadata", semver.MustParse("1.0.0"), - "Delete chain metadata entries from the Catalog service or local datastore files", + "Delete chain metadata entries from the Datastore", func(b cldfops.Bundle, deps DeleteChainMetadataDeps, input DeleteChainMetadataInput) (DeleteChainMetadataOutput, error) { dataStore := cldfdatastore.NewMemoryDataStore() err := dataStore.Merge(deps.DataStore) @@ -42,7 +42,7 @@ var DeleteChainMetadataOp = cldfops.NewOperation( } } - b.Logger.Infow("Catalog ChainMetadata successfully staged for deletion") + b.Logger.Infow("Datastore ChainMetadata successfully staged for deletion") return DeleteChainMetadataOutput{DataStore: dataStore}, nil }, diff --git a/catalog/operations/delete_contract_metadata.go b/datastore/operations/delete_contract_metadata.go similarity index 88% rename from catalog/operations/delete_contract_metadata.go rename to datastore/operations/delete_contract_metadata.go index 43c2280..fe68652 100644 --- a/catalog/operations/delete_contract_metadata.go +++ b/datastore/operations/delete_contract_metadata.go @@ -23,11 +23,11 @@ type DeleteContractMetadataOutput struct { DataStore cldfdatastore.MutableDataStore } -// DeleteContractMetadataOp deletes contract metadata entries from the Catalog service or local datastore files. +// DeleteContractMetadataOp deletes contract metadata entries from the Datastore. var DeleteContractMetadataOp = cldfops.NewOperation( "datastore-delete-contract-metadata", semver.MustParse("1.0.0"), - "Delete contract metadata entries from the Catalog service or local datastore files", + "Delete contract metadata entries from the Datastore", func(b cldfops.Bundle, deps DeleteContractMetadataDeps, input DeleteContractMetadataInput) (DeleteContractMetadataOutput, error) { dataStore := cldfdatastore.NewMemoryDataStore() err := dataStore.Merge(deps.DataStore) @@ -42,7 +42,7 @@ var DeleteContractMetadataOp = cldfops.NewOperation( } } - b.Logger.Infow("Catalog ContractMetadata successfully staged for deletion") + b.Logger.Infow("Datastore ContractMetadata successfully staged for deletion") return DeleteContractMetadataOutput{DataStore: dataStore}, nil }, diff --git a/catalog/operations/update_address_ref.go b/datastore/operations/update_address_ref.go similarity index 87% rename from catalog/operations/update_address_ref.go rename to datastore/operations/update_address_ref.go index 6ff1c36..e137e8a 100644 --- a/catalog/operations/update_address_ref.go +++ b/datastore/operations/update_address_ref.go @@ -25,11 +25,11 @@ type UpdateAddressRefOutput struct { DataStore cldfdatastore.MutableDataStore } -// UpdateAddressRefOp updates existing address ref entries in the Catalog service. +// UpdateAddressRefOp updates existing address ref entries in the Datastore. var UpdateAddressRefOp = cldfops.NewOperation( - "catalog-update-address-ref", + "datastore-update-address-ref", semver.MustParse("1.0.0"), - "Update address ref entries in the Catalog service", + "Update address ref entries in the Datastore", func(b cldfops.Bundle, deps UpdateAddressRefDeps, input UpdateAddressRefInput) (UpdateAddressRefOutput, error) { dataStore := cldfdatastore.NewMemoryDataStore() err := dataStore.Merge(deps.DataStore) @@ -40,11 +40,11 @@ var UpdateAddressRefOp = cldfops.NewOperation( for i, item := range input.AddressRefs { err = dataStore.Addresses().Update(item) if err != nil { - return UpdateAddressRefOutput{}, fmt.Errorf("failed to update address ref entry %d in catalog store: %w", i, err) + return UpdateAddressRefOutput{}, fmt.Errorf("failed to update address ref entry %d in datastore: %w", i, err) } } - b.Logger.Infow("Catalog AddressRef updated successfully") + b.Logger.Infow("Datastore AddressRef updated successfully") return UpdateAddressRefOutput{DataStore: dataStore}, nil }, diff --git a/catalog/operations/update_chain_metadata.go b/datastore/operations/update_chain_metadata.go similarity index 86% rename from catalog/operations/update_chain_metadata.go rename to datastore/operations/update_chain_metadata.go index fb153d9..602fcef 100644 --- a/catalog/operations/update_chain_metadata.go +++ b/datastore/operations/update_chain_metadata.go @@ -25,11 +25,11 @@ type UpdateChainMetadataOutput struct { DataStore cldfdatastore.MutableDataStore } -// UpdateChainMetadataOp updates existing chain metadata entries in the Catalog service. +// UpdateChainMetadataOp updates existing chain metadata entries in the Datastore. var UpdateChainMetadataOp = cldfops.NewOperation( - "catalog-update-chain-metadata", + "datastore-update-chain-metadata", semver.MustParse("1.0.0"), - "Update chain metadata entries in the Catalog service", + "Update chain metadata entries in the Datastore", func(b cldfops.Bundle, deps UpdateChainMetadataDeps, input UpdateChainMetadataInput) (UpdateChainMetadataOutput, error) { dataStore := cldfdatastore.NewMemoryDataStore() err := dataStore.Merge(deps.DataStore) @@ -40,11 +40,11 @@ var UpdateChainMetadataOp = cldfops.NewOperation( for i, item := range input.ChainMetadata { err = dataStore.ChainMetadata().Update(item) if err != nil { - return UpdateChainMetadataOutput{}, fmt.Errorf("failed to update chain metadata entry %d in catalog store: %w", i, err) + return UpdateChainMetadataOutput{}, fmt.Errorf("failed to update chain metadata entry %d in datastore: %w", i, err) } } - b.Logger.Infow("Catalog ChainMetadata updated successfully") + b.Logger.Infow("Datastore ChainMetadata updated successfully") return UpdateChainMetadataOutput{DataStore: dataStore}, nil }, diff --git a/catalog/operations/update_contract_metadata.go b/datastore/operations/update_contract_metadata.go similarity index 85% rename from catalog/operations/update_contract_metadata.go rename to datastore/operations/update_contract_metadata.go index ed8178b..eb6dcf6 100644 --- a/catalog/operations/update_contract_metadata.go +++ b/datastore/operations/update_contract_metadata.go @@ -25,11 +25,11 @@ type UpdateContractMetadataOutput struct { DataStore cldfdatastore.MutableDataStore } -// UpdateContractMetadataOp updates existing contract metadata entries in the Catalog service. +// UpdateContractMetadataOp updates existing contract metadata entries in the Datastore. var UpdateContractMetadataOp = cldfops.NewOperation( - "catalog-update-contract-metadata", + "datastore-update-contract-metadata", semver.MustParse("1.0.0"), - "Update contract metadata entries in the Catalog service", + "Update contract metadata entries in the Datastore", func(b cldfops.Bundle, deps UpdateContractMetadataDeps, input UpdateContractMetadataInput) (UpdateContractMetadataOutput, error) { dataStore := cldfdatastore.NewMemoryDataStore() err := dataStore.Merge(deps.DataStore) @@ -40,11 +40,11 @@ var UpdateContractMetadataOp = cldfops.NewOperation( for i, item := range input.ContractMetadata { err = dataStore.ContractMetadata().Update(item) if err != nil { - return UpdateContractMetadataOutput{}, fmt.Errorf("failed to update contract metadata entry %d in catalog store: %w", i, err) + return UpdateContractMetadataOutput{}, fmt.Errorf("failed to update contract metadata entry %d in datastore: %w", i, err) } } - b.Logger.Infow("Catalog ContractMetadata updated successfully") + b.Logger.Infow("Datastore ContractMetadata updated successfully") return UpdateContractMetadataOutput{DataStore: dataStore}, nil }, diff --git a/catalog/operations/update_env_metadata.go b/datastore/operations/update_env_metadata.go similarity index 87% rename from catalog/operations/update_env_metadata.go rename to datastore/operations/update_env_metadata.go index 9ec2e17..324ba60 100644 --- a/catalog/operations/update_env_metadata.go +++ b/datastore/operations/update_env_metadata.go @@ -25,11 +25,11 @@ type UpdateEnvMetadataOutput struct { DataStore cldfdatastore.MutableDataStore } -// UpdateEnvMetadataOp updates existing env metadata entries in the Catalog service. +// UpdateEnvMetadataOp updates existing env metadata entries in the Datastore. var UpdateEnvMetadataOp = cldfops.NewOperation( - "catalog-update-env-metadata", + "datastore-update-env-metadata", semver.MustParse("1.0.0"), - "Update env metadata entries in the Catalog service", + "Update env metadata entries in the Datastore", func(b cldfops.Bundle, deps UpdateEnvMetadataDeps, input UpdateEnvMetadataInput) (UpdateEnvMetadataOutput, error) { dataStore := cldfdatastore.NewMemoryDataStore() err := dataStore.Merge(deps.DataStore) @@ -39,10 +39,10 @@ var UpdateEnvMetadataOp = cldfops.NewOperation( err = dataStore.EnvMetadata().Set(input.EnvMetadata) if err != nil { - return UpdateEnvMetadataOutput{}, fmt.Errorf("failed to update env metadata in catalog store: %w", err) + return UpdateEnvMetadataOutput{}, fmt.Errorf("failed to update env metadata in datastore: %w", err) } - b.Logger.Infow("Catalog EnvMetadata updated successfully") + b.Logger.Infow("Datastore EnvMetadata updated successfully") return UpdateEnvMetadataOutput{DataStore: dataStore}, nil },