mirror of
https://github.com/google/nomulus.git
synced 2025-05-01 04:27:51 +02:00
6e74ba0587
ModulesService does not provide a great API. Specifically, it doesn't have a way to get the hostname for a specific service; you have to get the hostname for a specific version as well. This is very rarely what we want, as we publish new versions every week and don't expect old ones to hang around for very long, so a task should execute against whatever the live version is, not whatever the current version was back when the task was enqueued (especially because that version might be deleted by now). This new and improved wrapper API removes the confusion and plays better with dependency injection to boot. We can also fold in other methods having to do with App Engine services, whereas ModulesService was quite limited in scope. This also has the side effect of fixing ResaveEntityAction, which is currently broken because the tasks it's enqueuing to execute up to 30 days in the future have the version hard-coded into the hostname, and we typically delete old versions sooner than that. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=206173763
70 lines
2.4 KiB
Java
70 lines
2.4 KiB
Java
// Copyright 2018 The Nomulus Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package google.registry.util;
|
|
|
|
import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
|
|
|
|
import com.google.appengine.api.modules.ModulesService;
|
|
import com.google.appengine.api.modules.ModulesServiceFactory;
|
|
import dagger.Binds;
|
|
import dagger.Module;
|
|
import dagger.Provides;
|
|
import javax.inject.Inject;
|
|
|
|
/** A wrapper for {@link ModulesService} that provides a saner API. */
|
|
public class AppEngineServiceUtilsImpl implements AppEngineServiceUtils {
|
|
|
|
private final ModulesService modulesService;
|
|
|
|
@Inject
|
|
public AppEngineServiceUtilsImpl(ModulesService modulesService) {
|
|
this.modulesService = modulesService;
|
|
}
|
|
|
|
@Override
|
|
public String getServiceHostname(String service) {
|
|
// This will be in the format "version.service.projectid.appspot.com"
|
|
String hostnameWithVersion = modulesService.getVersionHostname(service, null);
|
|
// Strip off the version and return just "service.projectid.appspot.com"
|
|
return hostnameWithVersion.replaceFirst("^[^.]+\\.", "");
|
|
}
|
|
|
|
@Override
|
|
public String getCurrentVersionHostname(String service) {
|
|
return modulesService.getVersionHostname(service, null);
|
|
}
|
|
|
|
@Override
|
|
public String getVersionHostname(String service, String version) {
|
|
checkArgumentNotNull(version, "Must specify the version");
|
|
return modulesService.getVersionHostname(service, version);
|
|
}
|
|
|
|
/** Dagger module for AppEngineServiceUtils. */
|
|
@Module
|
|
public abstract static class AppEngineServiceUtilsModule {
|
|
|
|
private static final ModulesService modulesService = ModulesServiceFactory.getModulesService();
|
|
|
|
@Provides
|
|
static ModulesService provideModulesService() {
|
|
return modulesService;
|
|
}
|
|
|
|
@Binds
|
|
abstract AppEngineServiceUtils provideAppEngineServiceUtils(
|
|
AppEngineServiceUtilsImpl appEngineServiceUtilsImpl);
|
|
}
|
|
}
|