Skip to content

Commit 250d04f

Browse files
authored
SM-1249: drop vin device def id, make def id not null (#268)
* drop vin device def id, make def id not null * deprecate elastic search stuff * wip move vin decoding to definition_id * all errors for definitionid migration done, deprecate code for elastic and unused cli cmds * work on test updates * fix more thigns, tests * fix more tests * one last test... * lint * lint make mk * remove more unused code * test tweak
1 parent e5222b0 commit 250d04f

File tree

65 files changed

+505
-6388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+505
-6388
lines changed

charts/device-definitions-api/templates/secret.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ spec:
3535
- remoteRef:
3636
key: {{ .Release.Namespace }}/devices/redis/password
3737
secretKey: REDIS_PASSWORD
38-
- remoteRef:
39-
key: {{ .Release.Namespace }}/devices/elastic/appsearch/host
40-
secretKey: ELASTIC_SEARCH_APP_SEARCH_HOST
41-
- remoteRef:
42-
key: {{ .Release.Namespace }}/devices/elastic/appsearch/token
43-
secretKey: ELASTIC_SEARCH_APP_SEARCH_TOKEN
4438
- remoteRef:
4539
key: {{ .Release.Namespace }}/definitions/elastic/device_status/host
4640
secretKey: ELASTIC_SEARCH_DEVICE_STATUS_HOST

charts/device-definitions-api/values-prod.yaml

+1-6
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,4 @@ jobs:
6262
schedule: 0 0 * * 1
6363
args:
6464
- '-c'
65-
- /device-definitions-api sync-device-definitions-search; CODE=$?; echo "weekly typesense mmy search index sync completed"; wget -q --post-data "hello=shutdown" http://localhost:4191/shutdown &> /dev/null; exit $CODE;
66-
- name: feat-compat-updte
67-
schedule: 0 0 * * 0
68-
args:
69-
- '-c'
70-
- /device-definitions-api populate-device-features; CODE=$?; echo "weekly integration features update completed"; wget -q --post-data "hello=shutdown" http://localhost:4191/shutdown &> /dev/null; exit $CODE;
65+
- /device-definitions-api sync-device-definitions-search; CODE=$?; echo "weekly typesense mmy search index sync completed"; wget -q --post-data "hello=shutdown" http://localhost:4191/shutdown &> /dev/null; exit $CODE;

charts/device-definitions-api/values.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ env:
4747
DRIVLY_OFFER_API_URL: https://offers.dev.driv.ly
4848
FUEL_API_VEHICLES_ENDPOINT: https://api.fuelapi.com/v1/json/vehicles
4949
FUEL_API_IMAGES_ENDPOINT: https://api.fuelapi.com/v1/json/vehicle
50-
NHTSA_RECALLS_FILE_URL: https://static.nhtsa.gov/odi/ffdd/rcl/FLAT_RCL.zip
5150
VINCARIO_API_URL: https://api.vindecoder.eu/3.2
5251
DAT_GROUP_URL: https://www.datgroup.com/myClaim/soap/v2/VehicleIdentificationService
5352
PRIVATE_KEY_MODE: false

cmd/device-definitions-api/add_vin.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (p *addVINCmd) Execute(ctx context.Context, _ *flag.FlagSet, _ ...interface
104104
fmt.Println(err.Error() + " " + model + " " + strconv.Itoa(vinNumber.Year))
105105
return subcommands.ExitFailure
106106
}
107-
vinNumber.DeviceDefinitionID = deviceDefinition.ID
107+
vinNumber.DefinitionID = deviceDefinition.NameSlug
108108

109109
err = vinNumber.Insert(ctx, pdb.DBS().Writer, boil.Infer())
110110
if err != nil {
@@ -113,7 +113,7 @@ func (p *addVINCmd) Execute(ctx context.Context, _ *flag.FlagSet, _ ...interface
113113
}
114114

115115
// improvement, from existing data, try to guess Model
116-
fmt.Printf("added success, ddId: %s\n", vinNumber.DeviceDefinitionID)
116+
fmt.Printf("added success, ddId: %s\n", vinNumber.DefinitionID)
117117
return subcommands.ExitSuccess
118118
}
119119

cmd/device-definitions-api/main.go

-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,8 @@ func main() {
4949
subcommands.Register(&migrateDBCmd{logger: logger, settings: settings}, "")
5050
subcommands.Register(&syncOpsCmd{logger: logger, settings: settings}, "")
5151
subcommands.Register(&syncFuelImageCmd{logger: logger, settings: settings}, "")
52-
subcommands.Register(&syncDeviceFeatureCmd{logger: logger, settings: settings}, "")
5352
subcommands.Register(&addVINCmd{logger: logger, settings: settings}, "")
5453
subcommands.Register(&powerTrainTypeCmd{logger: logger, settings: settings}, "")
55-
subcommands.Register(&setVinNumbersDefinitionID{logger: logger, settings: settings}, "")
5654
subcommands.Register(&decodeVINCmd{logger: &logger, settings: &settings}, "")
5755
subcommands.Register(&syncDeviceDefinitionSearchCmd{logger: logger, settings: settings}, "")
5856
subcommands.Register(&bulkCreateDefinitions{logger: logger, settings: settings}, "")

cmd/device-definitions-api/populate_device_features.go

-298
This file was deleted.

0 commit comments

Comments
 (0)